Setting java/foreign/TestNative.java as native type (#1921)

Exclude it in Problemlist and add as separate native type. So it will be run by sanity and will not run by sanity.regular. Signed-off-by: Sophia Guo <sophiag@ca.ibm.com>
adoptium · Jul 27, 2020 · ef3b2ef · ef3b2ef
1 parent 6056e15
commit ef3b2ef
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 0 deletions.
diff --git a/openjdk/ProblemList_openjdk14-openj9.txt b/openjdk/ProblemList_openjdk14-openj9.txt
@@ -298,5 +298,6 @@ java/foreign/TestLayouts.java	https://github.com/AdoptOpenJDK/openjdk-tests/issu
 java/foreign/TestLayoutPaths.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1701	generic-all
 java/foreign/TestByteBuffer.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1702	generic-all
 java/foreign/TestLayoutConstants.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1702	generic-all
+java/foreign/TestNative.java https://github.com/AdoptOpenJDK/openjdk-tests/issues/1920 generic-all
 
 ############################################################################
diff --git a/openjdk/ProblemList_openjdk14.txt b/openjdk/ProblemList_openjdk14.txt
@@ -194,3 +194,4 @@ vm/JniInvocationTest.java	https://github.com/AdoptOpenJDK/openjdk-build/issues/2
 java/foreign/TestArrays.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1701 generic-all
 java/foreign/TestLayouts.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1701 generic-all
 java/foreign/TestLayoutPaths.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1701	generic-all
+java/foreign/TestNative.java https://github.com/AdoptOpenJDK/openjdk-tests/issues/1920 generic-all
diff --git a/openjdk/ProblemList_openjdk15-openj9.txt b/openjdk/ProblemList_openjdk15-openj9.txt
@@ -322,5 +322,6 @@ java/foreign/TestLayouts.java	https://github.com/AdoptOpenJDK/openjdk-tests/issu
 java/foreign/TestLayoutPaths.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1701	generic-all
 java/foreign/TestByteBuffer.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1702	generic-all
 java/foreign/TestLayoutConstants.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1702	generic-all
+java/foreign/TestNative.java https://github.com/AdoptOpenJDK/openjdk-tests/issues/1920 generic-all
 
 ############################################################################
diff --git a/openjdk/ProblemList_openjdk15.txt b/openjdk/ProblemList_openjdk15.txt
@@ -175,4 +175,6 @@ java/util/concurrent/tck/JSR166TestCase.java	https://github.com/AdoptOpenJDK/ope
 java/foreign/TestArrays.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1701 generic-all
 java/foreign/TestLayouts.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1701 generic-all
 java/foreign/TestLayoutPaths.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1701	generic-all
+java/foreign/TestNative.java https://github.com/AdoptOpenJDK/openjdk-tests/issues/1920 generic-all
+
 ############################################################################
diff --git a/openjdk/playlist.xml b/openjdk/playlist.xml
@@ -753,6 +753,30 @@
 			<group>openjdk</group>
 		</groups>
 	</test>
+	<test>
+		<testCaseName>jdk_foreign_native</testCaseName>
+		<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
+	$(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m --add-modules jdk.incubator.foreign $(JVM_OPTIONS)$(Q) \
+	-w $(Q)$(REPORTDIR)$(D)work$(Q) \
+	-r $(Q)$(TEST_RESROOT)$(D)report$(Q) \
+	-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
+	-exclude:$(Q)$(JTREG_JDK_TEST_DIR)$(D)ProblemList.txt$(Q) \
+	-exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \
+	$(Q)$(OPENJDK_DIR)$(D)test$(D)jdk$(D)java$(D)foreign(D)TestNative.java$(Q);
+	$(TEST_STATUS)</command>
+		<subsets>
+			<subset>14+</subset>
+		</subsets>
+		<levels>
+			<level>sanity</level>
+		</levels>
+		<types>
+			<type>native</type>
+		</types>
+		<groups>
+			<group>openjdk</group>
+		</groups>
+	</test>
 	<test>
 		<testCaseName>jdk_instrument</testCaseName>
 		<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \