Merge pull request #21098 from dennycjacob/thrstate

Consolidating two thrstatetests
eclipse-openj9 · Feb 11, 2025 · 96e177f · 96e177f
2 parents 1c4701c + 76ecda2
commit 96e177f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 31 deletions.
diff --git a/test/functional/NativeTest/nativeTestSettings.mk b/test/functional/NativeTest/nativeTestSettings.mk
@@ -22,6 +22,7 @@
 
 ifeq (8, $(JDK_VERSION))
   TEST_JAVA=$(REPORTDIR_NQ)/testJava/jre
+  THRSTATETEST_JRE_HOME = $(SQ)$(TEST_JDK_HOME)$(D)jre$(D)$(SQ)
   ifneq (,$(findstring -64, $(SPEC)))
     ZOS_SPEC=s390x
   else
@@ -35,6 +36,7 @@ ifeq (8, $(JDK_VERSION))
     LIBJ9IFA29=/jre/lib/$(ZOS_SPEC)/default/libj9ifa29.so
   endif
 else
+  THRSTATETEST_JRE_HOME = $(SQ)$(TEST_JDK_HOME)$(D)$(SQ)
   TEST_JAVA=$(REPORTDIR_NQ)/testJava
   PATH_TO_LIB=$(TEST_JAVA)/lib/j9vm:$(TEST_JAVA)/lib/default:$(TEST_JAVA)/lib
   LIBJ9IFA29=/lib/default/libj9ifa29.so

diff --git a/test/functional/NativeTest/playlist.xml b/test/functional/NativeTest/playlist.xml
@@ -485,7 +485,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 			<variation>Mode610</variation>
 		</variations>
 		<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
-			$(SQ)$(JAVA_SHARED_LIBRARIES_DIR)$(D)thrstatetest$(SQ) $(JVM_OPTIONS) -Djava.home=$(SQ)$(TEST_JDK_HOME)$(D)jre$(D)$(SQ) -Dcom.ibm.tools.attach.enable=no -Dibm.java9.forceCommonCleanerShutdown=true ; \
+			$(SQ)$(JAVA_SHARED_LIBRARIES_DIR)$(D)thrstatetest$(SQ) $(JVM_OPTIONS) -Djava.home=$(THRSTATETEST_JRE_HOME) -Dcom.ibm.tools.attach.enable=no -Dibm.java9.forceCommonCleanerShutdown=true ; \
 			$(TEST_STATUS)
 		</command>
 		<levels>
@@ -497,36 +497,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<types>
 			<type>native</type>
 		</types>
-		<versions>
-			<version>8</version>
-		</versions>
-		<impls>
-			<impl>openj9</impl>
-			<impl>ibm</impl>
-		</impls>
-	</test>
-	<test>
-		<testCaseName>thrstatetest</testCaseName>
-		<variations>
-			<variation>Mode110</variation>
-			<variation>Mode610</variation>
-		</variations>
-		<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
-			$(SQ)$(JAVA_SHARED_LIBRARIES_DIR)$(D)thrstatetest$(SQ) $(JVM_OPTIONS) -Djava.home=$(SQ)$(TEST_JDK_HOME)$(D)$(SQ) -Dcom.ibm.tools.attach.enable=no -Dibm.java9.forceCommonCleanerShutdown=true ; \
-			$(TEST_STATUS)
-		</command>
-		<levels>
-			<level>sanity</level>
-		</levels>
-		<groups>
-			<group>functional</group>
-		</groups>
-		<types>
-			<type>native</type>
-		</types>
-		<versions>
-			<version>11+</version>
-		</versions>
 		<impls>
 			<impl>openj9</impl>
 			<impl>ibm</impl>