Ensure the coverage for mixedref SDK in system tests (#2148)

- for generic tests for all JVM, add Mode150 and Mode650 - for tests for openj9/ibm only, add Mode110 and Mode610 - remove Mode110 and Mode610 in special tests if above modes are added in sanity/extended Related: eclipse-openj9/openj9#9231 Signed-off-by: lanxia <[email protected]>
adoptium · Jan 8, 2021 · e88557b · e88557b
1 parent ac7bb76
commit e88557b
Show file tree

Hide file tree

Showing 8 changed files with 202 additions and 146 deletions.
diff --git a/system/daaLoadTest/playlist.xml b/system/daaLoadTest/playlist.xml
@@ -21,7 +21,8 @@
 	<test>
 		<testCaseName>DaaLoadTest_daa1</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa1$(Q) -test=DaaLoadTest; \
 	$(TEST_STATUS)</command>
@@ -39,7 +40,8 @@
 	<test>
 		<testCaseName>DaaLoadTest_daa2</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa2$(Q)  -test=DaaLoadTest; \
 	$(TEST_STATUS)</command>
@@ -57,7 +59,8 @@
 	<test>
 		<testCaseName>DaaLoadTest_daa3</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa3$(Q) -test=DaaLoadTest; \
 	$(TEST_STATUS)</command>
@@ -75,7 +78,8 @@
 	<test>
 		<testCaseName>DaaLoadTest_all</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=DaaLoadTest; \
 	$(TEST_STATUS)</command>
@@ -173,7 +177,6 @@
 			<variation>Mode103</variation>
 			<variation>Mode104</variation>
 			<variation>Mode107</variation>
-			<variation>Mode110</variation>
 			<variation>Mode112</variation>
 			<variation>Mode113</variation>
 			<variation>Mode121</variation>
@@ -190,7 +193,6 @@
 			<variation>Mode556</variation>
 			<variation>Mode557</variation>
 			<variation>Mode607</variation>
-			<variation>Mode610</variation>
 			<variation>Mode614</variation>
 			<variation>Mode615</variation>
 			<variation>Mode687</variation>
@@ -223,7 +225,6 @@
 			<variation>Mode103</variation>
 			<variation>Mode104</variation>
 			<variation>Mode107</variation>
-			<variation>Mode110</variation>
 			<variation>Mode112</variation>
 			<variation>Mode113</variation>
 			<variation>Mode121</variation>
@@ -240,7 +241,6 @@
 			<variation>Mode556</variation>
 			<variation>Mode557</variation>
 			<variation>Mode607</variation>
-			<variation>Mode610</variation>
 			<variation>Mode614</variation>
 			<variation>Mode615</variation>
 			<variation>Mode687</variation>
@@ -273,7 +273,6 @@
 			<variation>Mode103</variation>
 			<variation>Mode104</variation>
 			<variation>Mode107</variation>
-			<variation>Mode110</variation>
 			<variation>Mode112</variation>
 			<variation>Mode113</variation>
 			<variation>Mode121</variation>
@@ -290,7 +289,6 @@
 			<variation>Mode556</variation>
 			<variation>Mode557</variation>
 			<variation>Mode607</variation>
-			<variation>Mode610</variation>
 			<variation>Mode614</variation>
 			<variation>Mode615</variation>
 			<variation>Mode687</variation>
@@ -323,7 +321,6 @@
 			<variation>Mode103</variation>
 			<variation>Mode104</variation>
 			<variation>Mode107</variation>
-			<variation>Mode110</variation>
 			<variation>Mode112</variation>
 			<variation>Mode113</variation>
 			<variation>Mode121</variation>
@@ -340,7 +337,6 @@
 			<variation>Mode556</variation>
 			<variation>Mode557</variation>
 			<variation>Mode607</variation>
-			<variation>Mode610</variation>
 			<variation>Mode614</variation>
 			<variation>Mode615</variation>
 			<variation>Mode687</variation>

diff --git a/system/jlm/playlist.xml b/system/jlm/playlist.xml
@@ -25,7 +25,8 @@
 	<test>
 		<testCaseName>TestJlmLocal</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode150</variation>
+			<variation>Mode650</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestJlmLocal; \
 	$(TEST_STATUS)</command>
@@ -41,7 +42,8 @@
 	<test>
 		<testCaseName>TestJlmRemoteClassAuth</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode150</variation>
+			<variation>Mode650</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestJlmRemoteClassAuth; \
 	$(TEST_STATUS)</command>
@@ -56,7 +58,8 @@
 	<test>
 		<testCaseName>TestJlmRemoteClassNoAuth</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode150</variation>
+			<variation>Mode650</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestJlmRemoteClassNoAuth; \
 	$(TEST_STATUS)</command>
@@ -72,7 +75,8 @@
 	<test>
 		<testCaseName>TestJlmRemoteMemoryAuth</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode150</variation>
+			<variation>Mode650</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestJlmRemoteMemoryAuth; \
 	$(TEST_STATUS)</command>
@@ -87,7 +91,8 @@
 	<test>
 		<testCaseName>TestJlmRemoteMemoryNoAuth</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode150</variation>
+			<variation>Mode650</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestJlmRemoteMemoryNoAuth; \
 	$(TEST_STATUS)</command>
@@ -103,7 +108,8 @@
 	<test>
 		<testCaseName>TestJlmRemoteNotifierProxyAuth</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode150</variation>
+			<variation>Mode650</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestJlmRemoteNotifierProxyAuth; \
 	$(TEST_STATUS)</command>
@@ -120,7 +126,8 @@
 	<test>
 		<testCaseName>TestJlmRemoteThreadAuth</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode150</variation>
+			<variation>Mode650</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestJlmRemoteThreadAuth; \
 	$(TEST_STATUS)</command>
@@ -135,7 +142,8 @@
 	<test>
 		<testCaseName>TestJlmRemoteThreadNoAuth</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode150</variation>
+			<variation>Mode650</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestJlmRemoteThreadNoAuth; \
 	$(TEST_STATUS)</command>
@@ -150,7 +158,8 @@
 	<test>
 		<testCaseName>TestIBMJlmLocal</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestIBMJlmLocal; \
 	$(TEST_STATUS)</command>
@@ -171,7 +180,8 @@
 	<test>
 		<testCaseName>TestIBMJlmRemoteClassAuth</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestIBMJlmRemoteClassAuth; \
 	$(TEST_STATUS)</command>
@@ -195,7 +205,8 @@
 	<test>
 		<testCaseName>TestIBMJlmRemoteClassAuth_SE80</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestIBMJlmRemoteClassAuth; \
 	$(TEST_STATUS)</command>
@@ -217,7 +228,8 @@
 	<test>
 		<testCaseName>TestIBMJlmRemoteClassAuth_SE80_Linux</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestIBMJlmRemoteClassAuth; \
 	$(TEST_STATUS)</command>
@@ -240,7 +252,8 @@
 	<test>
 		<testCaseName>TestIBMJlmRemoteClassNoAuth</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestIBMJlmRemoteClassNoAuth; \
 	$(TEST_STATUS)</command>
@@ -261,7 +274,8 @@
 	<test>
 		<testCaseName>TestIBMJlmRemoteClassNoAuth_SE80</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestIBMJlmRemoteClassNoAuth; \
 	$(TEST_STATUS)</command>
@@ -283,7 +297,8 @@
 	<test>
 		<testCaseName>TestIBMJlmRemoteClassNoAuth_SE80_Linux</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestIBMJlmRemoteClassNoAuth; \
 	$(TEST_STATUS)</command>
@@ -308,7 +323,8 @@
 	<test>
 		<testCaseName>TestIBMJlmRemoteMemoryAuth</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestIBMJlmRemoteMemoryAuth; \
 	$(TEST_STATUS)</command>
@@ -332,7 +348,8 @@
 	<test>
 		<testCaseName>TestIBMJlmRemoteMemoryAuth_SE80</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestIBMJlmRemoteMemoryAuth; \
 	$(TEST_STATUS)</command>
@@ -354,7 +371,8 @@
 	<test>
 		<testCaseName>TestIBMJlmRemoteMemoryAuth_SE80_Linux</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestIBMJlmRemoteMemoryAuth; \
 	$(TEST_STATUS)</command>
@@ -377,7 +395,8 @@
 	<test>
 		<testCaseName>TestIBMJlmRemoteMemoryNoAuth</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestIBMJlmRemoteMemoryNoAuth; \
 	$(TEST_STATUS)</command>
@@ -398,7 +417,8 @@
 	<test>
 		<testCaseName>TestIBMJlmRemoteMemoryNoAuth_SE80</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestIBMJlmRemoteMemoryNoAuth; \
 	$(TEST_STATUS)</command>
@@ -420,7 +440,8 @@
 	<test>
 		<testCaseName>TestIBMJlmRemoteMemoryNoAuth_SE80_Linux</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=TestIBMJlmRemoteMemoryNoAuth; \
 	$(TEST_STATUS)</command>

diff --git a/system/lambdaLoadTest/playlist.xml b/system/lambdaLoadTest/playlist.xml
@@ -22,7 +22,8 @@
 	<test>
 		<testCaseName>LambdaLoadTest_Hotspot</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode150</variation>
+			<variation>Mode650</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest; \
 	$(TEST_STATUS)</command>
@@ -39,7 +40,8 @@
 	<test>
 		<testCaseName>LambdaLoadTest_OpenJ9_NonLinux</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest; \
 	$(TEST_STATUS)</command>
@@ -58,7 +60,8 @@
 	<test>
 		<testCaseName>LambdaLoadTest_OpenJ9_Linux_CompressedRefs</testCaseName>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode110</variation>
+			<variation>Mode610</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest; \
 	$(TEST_STATUS)</command>
@@ -80,7 +83,8 @@
 			<comment>AdoptOpenJDK/openjdk-systemtest/issues/63</comment>
 		</disabled>
 		<variations>
-			<variation>NoOptions</variation>
+			<variation>Mode150</variation>
+			<variation>Mode650</variation>
 		</variations>
 		<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=JdiTest; \
 	$(TEST_STATUS)</command>
@@ -118,7 +122,6 @@
 			<variation>Mode103</variation>
 			<variation>Mode104</variation>
 			<variation>Mode107</variation>
-			<variation>Mode110</variation>
 			<variation>Mode112</variation>
 			<variation>Mode113</variation>
 			<variation>Mode121</variation>
@@ -135,7 +138,6 @@
 			<variation>Mode556</variation>
 			<variation>Mode557</variation>
 			<variation>Mode607</variation>
-			<variation>Mode610</variation>
 			<variation>Mode614</variation>
 			<variation>Mode615</variation>
 			<variation>Mode687</variation>
@@ -169,7 +171,6 @@
 			<variation>Mode103</variation>
 			<variation>Mode104</variation>
 			<variation>Mode107</variation>
-			<variation>Mode110</variation>
 			<variation>Mode112</variation>
 			<variation>Mode113</variation>
 			<variation>Mode121</variation>
@@ -186,7 +187,6 @@
 			<variation>Mode556</variation>
 			<variation>Mode557</variation>
 			<variation>Mode607</variation>
-			<variation>Mode610</variation>
 			<variation>Mode614</variation>
 			<variation>Mode615</variation>
 			<variation>Mode687</variation>