Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP Add X11 setup and DISPLAY settings #242

Closed
wants to merge 2 commits into from
Closed

WIP Add X11 setup and DISPLAY settings #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
761a127
WIP enable x11 server and display settings
smlambert Feb 6, 2018
824b943
Add missing ] bracket
smlambert Feb 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion buildenv/jenkins/Jenkinsfile_personal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ pipeline {
withEnv(["JAVA_HOME=$WORKSPACE/openjdkbinary/j2sdk-image/${(params.JAVA_VERSION == 'SE80') ? 'jre/' : ''}",
"JAVA_BIN=$WORKSPACE/openjdkbinary/j2sdk-image/${(params.JAVA_VERSION == 'SE80') ? 'jre/' : ''}bin",
"JAVA_VERSION=${params.JAVA_VERSION}"]) {
sh "$OPENJDK_TEST/maketest.sh $OPENJDK_TEST ${params.TARGET}"
wrap([$class: 'Xvfb']) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we are using DISPLAY=:1, we need to tell Xvfb to set display name to :1.
This would be like wrap([$class: 'Xvfb', displayName: 1]) {

sh "$OPENJDK_TEST/maketest.sh $OPENJDK_TEST ${params.TARGET}"
}
}
}
}
Expand Down
29 changes: 1 addition & 28 deletions openjdk_regression/ProblemList_openjdk8.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,33 +111,6 @@ java/beans/PropertyEditor/TestFontClassJava.java 117 generic-all
java/beans/PropertyEditor/TestFontClassNull.java 117 generic-all
java/beans/PropertyEditor/TestFontClassValue.java 117 generic-all
java/beans/XMLEncoder/java_awt_ScrollPane.java 117 generic-all
java/beans/EventHandler/Test6179222.java 136 macosx-all
java/beans/EventHandler/Test6788531.java 136 macosx-all
java/beans/PropertyChangeSupport/Test4682386.java 136 macosx-all
java/beans/PropertyChangeSupport/TestSynchronization.java 136 macosx-all
java/beans/Statement/Test4653179.java 136 macosx-all
java/beans/XMLDecoder/8028054/TestConstructorFinder.java 136 macosx-all
java/beans/XMLDecoder/spec/TestObject.java 136 macosx-all
java/beans/XMLEncoder/Test4631471.java 136 macosx-all
java/beans/XMLEncoder/Test4652928.java 136 macosx-all
java/beans/XMLEncoder/Test4822050.java 136 macosx-all
java/beans/XMLEncoder/Test4903007.java 136 macosx-all
java/beans/XMLEncoder/Test6437265.java 136 macosx-all
java/beans/XMLEncoder/Test6501431.java 136 macosx-all
java/beans/XMLEncoder/Test6570354.java 136 macosx-all
java/beans/XMLEncoder/java_awt_BorderLayout.java 136 macosx-all
java/beans/XMLEncoder/java_awt_CardLayout.java 136 macosx-all
java/beans/XMLEncoder/java_awt_GridBagLayout.java 136 macosx-all
java/beans/XMLEncoder/javax_swing_BoxLayout.java 136 macosx-all
java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java 136 macosx-all
java/beans/XMLEncoder/javax_swing_JButton.java 136 macosx-all
java/beans/XMLEncoder/javax_swing_JLayeredPane.java 136 macosx-all
java/beans/XMLEncoder/javax_swing_JSplitPane.java 136 macosx-all
java/beans/XMLEncoder/javax_swing_JTree.java 136 macosx-all
java/beans/XMLEncoder/javax_swing_OverlayLayout.java 136 macosx-all
java/beans/XMLEncoder/javax_swing_border_TitledBorder.java 136 macosx-all
java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_TitledBorderUIResource.java 136 macosx-all
java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java 136 macosx-all
############################################################################

# jdk_lang
Expand Down Expand Up @@ -198,7 +171,7 @@ sun/security/ssl/SSLSocketImpl/SSLSocketCloseHang.java 125 generic-all

# jdk_sound
javax/sound/midi/Devices/InitializationHang.java 73 generic-all
javax/sound/midi/Devices/InitializationHang.java 136 generic-all

############################################################################

# jdk_swing
Expand Down
22 changes: 21 additions & 1 deletion openjdk_regression/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</test>
<test>
<testCaseName>jdk_beans</testCaseName>
<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
<command>export DISPLAY=:1; $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
$(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \
-w $(Q)$(TEST_RESROOT)$(D)work$(Q) \
-r $(Q)$(TEST_RESROOT)$(D)report$(Q) \
Expand Down Expand Up @@ -470,4 +470,24 @@
<tag>extended</tag>
</tags>
</test>

<testCaseName>jdk_awt</testCaseName>
<command>export DISPLAY=:1; $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_DIR)$(D)lib$(D)jtreg.jar$(Q) \
$(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \
-w $(Q)$(TEST_RESROOT)$(D)work$(Q) \
-r $(Q)$(TEST_RESROOT)$(D)report$(Q) \
-jdk:$(Q)$(JDK_HOME)$(Q) \
-exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \
$(Q)$(JTREG_TEST_DIR):jdk_awt$(Q); \
$(TEST_STATUS)</command>
<subsets>
<subset>SE80</subset>
<subset>SE90</subset>
<subset>SE100</subset>
</subsets>
<tags>
<tag>extended</tag>
</tags>
</test>

</playlist>