Update hotspot jtreg tests (#1342)

1. Add openj9 native path 2. Remove testcase hotspot_all, which is the whole set of hotspot jtreg test set 3. Select hotspot_native_sanity, hotspot_compiler hotspot and runtime_nestmate jtreg test sets Signed-off-by: Sophia Guo <sophiag@ca.ibm.com>
adoptium · Sep 13, 2019 · 0ea804d · 0ea804d
1 parent 55d12cf
commit 0ea804d
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 11 deletions.
diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase
@@ -353,6 +353,9 @@ def buildTest() {
 			if (fileExists('openjdkbinary/openjdk-test-image/hotspot/jtreg/native')) {
 				env.HOTSPOT_NATIVE_TEST_PATH = "$WORKSPACE/openjdkbinary/openjdk-test-image/hotspot/jtreg/native"
 			}
+			if (fileExists('openjdkbinary/openjdk-test-image/openj9')) {
+				env.OPENJ9_NATIVE_TEST_PATH = "$WORKSPACE/openjdkbinary/openjdk-test-image/openj9"
+			}
 			// use sshagent with Jenkins credentials ID for all platforms except zOS
 			if (!env.SPEC.startsWith('zos')) {
 				sshagent (credentials: ["$params.SSH_AGENT_CREDENTIAL"], ignoreMissing: true) {

diff --git a/openjdk/openjdk.mk b/openjdk/openjdk.mk
@@ -60,9 +60,13 @@ ifdef JDK_NATIVE_TEST_PATH
 	JDK_NATIVE_OPTIONS := -nativepath:"$(JDK_NATIVE_TEST_PATH)"
 endif
 
-HOTSPOT_NATIVE_OPTIONS :=
+JVM_NATIVE_OPTIONS :=
 ifdef HOTSPOT_NATIVE_TEST_PATH
-	HOTSPOT_NATIVE_OPTIONS := -nativepath:"$(HOTSPOT_NATIVE_TEST_PATH)"
+	JVM_NATIVE_OPTIONS := -nativepath:"$(HOTSPOT_NATIVE_TEST_PATH)"
+endif
+
+ifdef OPENJ9_NATIVE_TEST_PATH
+	JVM_NATIVE_OPTIONS := -nativepath:"$(OPENJ9_NATIVE_TEST_PATH)"
 endif
 
 ifdef OPENJDK_DIR 

diff --git a/openjdk/playlist.xml b/openjdk/playlist.xml
@@ -75,28 +75,63 @@
 			<impl>hotspot</impl>
 		</impls>
 	</test>
-		<test>
-		<testCaseName>hotspot_all_SE100</testCaseName>
+	<test>
+		<testCaseName>jvm_native_sanity</testCaseName>
 		<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
-	$(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \
+	$(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \
 	-w $(Q)$(REPORTDIR)$(D)work$(Q) \
 	-r $(Q)$(TEST_RESROOT)$(D)report$(Q) \
 	-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
-	$(Q)$(JTREG_HOTSPOT_TEST_DIR):hotspot_all$(Q); \
+	$(Q)$(JTREG_HOTSPOT_TEST_DIR):hotspot_native_sanity$(Q); \
 	$(TEST_STATUS)</command>
 		<subsets>
-			<subset>10</subset>
+			<subset>11+</subset>
+		</subsets>
+		<levels>
+			<level>extended</level>
+		</levels>
+		<groups>
+			<group>openjdk</group>
+		</groups>
+	</test>
+	<test>
+		<testCaseName>jvm_compiler</testCaseName>
+		<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
+	$(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \
+	-w $(Q)$(REPORTDIR)$(D)work$(Q) \
+	-r $(Q)$(TEST_RESROOT)$(D)report$(Q) \
+	-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
+	$(Q)$(JTREG_HOTSPOT_TEST_DIR):hotspot_compiler$(Q); \
+	$(TEST_STATUS)</command>
+		<subsets>
+			<subset>11+</subset>
+		</subsets>
+		<levels>
+			<level>extended</level>
+		</levels>
+		<groups>
+			<group>openjdk</group>
+		</groups>
+	</test>
+	<test>
+		<testCaseName>runtime_nestmate</testCaseName>
+		<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
+	$(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \
+	-w $(Q)$(REPORTDIR)$(D)work$(Q) \
+	-r $(Q)$(TEST_RESROOT)$(D)report$(Q) \
+	-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
+	-exclude:$(Q)$(TEST_RESROOT)$(D)ProblemList_$(JVM_VERSION).txt$(Q) \
+	$(Q)$(JTREG_HOTSPOT_TEST_DIR)$(D)runtime$(D)Nestmates$(Q); \
+	$(TEST_STATUS)</command>
+		<subsets>
+			<subset>11+</subset>
 		</subsets>
 		<levels>
 			<level>extended</level>
 		</levels>
 		<groups>
 			<group>openjdk</group>
 		</groups>
-		<impls>
-			<impl>hotspot</impl>
-		</impls>
-		<disabled>https://github.com/AdoptOpenJDK/openjdk-tests/issues/228</disabled>
 	</test>
 	<test>
 		<testCaseName>hotspot_jre</testCaseName>