jck.mk and 'tests' value of compiler.lang/playlist.xml do not match

adoptium · May 26, 2023 · 72d1988 · 72d1988
1 parent c51a43f
commit 72d1988
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 45 deletions.
diff --git a/jck/compiler.lang/playlist.xml b/jck/compiler.lang/playlist.xml
@@ -1333,50 +1333,6 @@
 			<group>jck</group>
 		</groups>
 	</test>
-	<test>
-		<testCaseName>jck-compiler-lang-LMBD-group6_multijvm</testCaseName>
-		<disables>
-			<disable>
-				<comment>Disabled temporarily in multijvm mode</comment>
-				<impl>openj9</impl>
-			</disable>
-		</disables>
-		<variations>
-			<variation>NoOptions</variation>
-		</variations>
-		<command>$(GEN_JTB) tests=$(COMPILER_LANG_LMBD_TESTS_GROUP6) testsuite=COMPILER$(USEQ); \
-		$(START_MULTI_JVM_COMP_TEST); \
-		$(GEN_SUMMARY) tests=$(COMPILER_LANG_LMBD_TESTS_GROUP6) testsuite=COMPILER; \
-		$(TEST_STATUS)</command>
-		<levels>
-			<level>dev</level>
-		</levels>
-		<groups>
-			<group>jck</group>
-		</groups>
-	</test>
-	<test>
-		<testCaseName>jck-compiler-lang-LMBD-group7_multijvm</testCaseName>
-		<disables>
-			<disable>
-				<comment>Disabled temporarily in multijvm mode</comment>
-				<impl>openj9</impl>
-			</disable>
-		</disables>
-		<variations>
-			<variation>NoOptions</variation>
-		</variations>
-		<command>$(GEN_JTB) tests=$(COMPILER_LANG_LMBD_TESTS_GROUP7) testsuite=COMPILER$(USEQ); \
-		$(START_MULTI_JVM_COMP_TEST); \
-		$(GEN_SUMMARY) tests=$(COMPILER_LANG_LMBD_TESTS_GROUP7) testsuite=COMPILER; \
-		$(TEST_STATUS)</command>
-		<levels>
-			<level>dev</level>
-		</levels>
-		<groups>
-			<group>jck</group>
-		</groups>
-	</test>
 	<test>
 		<testCaseName>jck-compiler-lang-ARR_multijvm</testCaseName>
 		<variations>

diff --git a/jck/jck.mk b/jck/jck.mk
@@ -217,7 +217,7 @@ ifeq (8, $(JDK_VERSION))
    COMPILER_LANG_ANNOT_TESTS_GROUP2=$(Q)lang/ANNOT/annot018;lang/ANNOT/annot019;lang/ANNOT/annot020;lang/ANNOT/annot021;lang/ANNOT/annot022;lang/ANNOT/annot023;lang/ANNOT/annot024;lang/ANNOT/annot025;lang/ANNOT/annot026;lang/ANNOT/annot027;lang/ANNOT/annot028;lang/ANNOT/annot029;lang/ANNOT/annot030;lang/ANNOT/annot031;lang/ANNOT/annot032;lang/ANNOT/annot033;lang/ANNOT/annot034$(Q)
    COMPILER_LANG_ANNOT_TESTS_GROUP3=$(Q)lang/ANNOT/annot035;lang/ANNOT/annot036;lang/ANNOT/annot037;lang/ANNOT/annot038;lang/ANNOT/annot039;lang/ANNOT/annot040;lang/ANNOT/annot041;lang/ANNOT/annot042;lang/ANNOT/annot043;lang/ANNOT/annot044;lang/ANNOT/annot045;lang/ANNOT/annot046;lang/ANNOT/annot047;lang/ANNOT/annot049;lang/ANNOT/annot050;lang/ANNOT/annot052;lang/ANNOT/annot055$(Q)
    COMPILER_LANG_ANNOT_TESTS_GROUP4=$(Q)lang/ANNOT/annot060;lang/ANNOT/annot061;lang/ANNOT/annot062;lang/ANNOT/annot101;lang/ANNOT/annot102;lang/ANNOT/annot103;lang/ANNOT/annot104;lang/ANNOT/annot105;lang/ANNOT/annot106;lang/ANNOT/annot107;lang/ANNOT/annot109;lang/ANNOT/annot110;lang/ANNOT/annot111;lang/ANNOT/annot112;lang/ANNOT/annot120;lang/ANNOT/annot121;lang/ANNOT/annot122$(Q)
-   COMPILER_LANG_ANNOT_TESTS_GROUP6=$(Q)lang/ANNOT/annot123;lang/ANNOT/annot124;lang/ANNOT/annot125;lang/ANNOT/annot126;lang/ANNOT/annot127;lang/ANNOT/annot128;lang/ANNOT/annot129;lang/ANNOT/annot130;lang/ANNOT/annot131;lang/ANNOT/annot132;lang/ANNOT/annot133;lang/ANNOT/annot134;lang/ANNOT/annot136;lang/ANNOT/annot137;lang/ANNOT/annot138;lang/ANNOT/annot139;lang/ANNOT/annot140;lang/ANNOT/annot141;lang/ANNOT/annot142;lang/ANNOT/annot143$(Q)
+   COMPILER_LANG_ANNOT_TESTS_GROUP5=$(Q)lang/ANNOT/annot123;lang/ANNOT/annot124;lang/ANNOT/annot125;lang/ANNOT/annot126;lang/ANNOT/annot127;lang/ANNOT/annot128;lang/ANNOT/annot129;lang/ANNOT/annot130;lang/ANNOT/annot131;lang/ANNOT/annot132;lang/ANNOT/annot133;lang/ANNOT/annot134;lang/ANNOT/annot136;lang/ANNOT/annot137;lang/ANNOT/annot138;lang/ANNOT/annot139;lang/ANNOT/annot140;lang/ANNOT/annot141;lang/ANNOT/annot142;lang/ANNOT/annot143$(Q)
 
    COMPILER_LANG_STMT_TESTS_GROUP1=$(Q)lang/STMT/stmt001;lang/STMT/stmt002;lang/STMT/stmt003;lang/STMT/stmt004;lang/STMT/stmt005;lang/STMT/stmt006;lang/STMT/stmt007;lang/STMT/stmt008;lang/STMT/stmt009;lang/STMT/stmt010;lang/STMT/stmt011;lang/STMT/stmt012;lang/STMT/stmt013;lang/STMT/stmt014;lang/STMT/stmt015;lang/STMT/stmt016;lang/STMT/stmt017;lang/STMT/stmt018;lang/STMT/stmt019;lang/STMT/stmt020;lang/STMT/stmt021;lang/STMT/stmt022;lang/STMT/stmt023;lang/STMT/stmt024;lang/STMT/stmt025;lang/STMT/stmt026;lang/STMT/stmt027;lang/STMT/stmt028;lang/STMT/stmt029;lang/STMT/stmt030;lang/STMT/stmt031;lang/STMT/stmt032;lang/STMT/stmt033;lang/STMT/stmt034;lang/STMT/stmt035;lang/STMT/stmt036;lang/STMT/stmt037;lang/STMT/stmt038;lang/STMT/stmt039;lang/STMT/stmt040;lang/STMT/stmt041;lang/STMT/stmt042;lang/STMT/stmt043;lang/STMT/stmt044;lang/STMT/stmt045;lang/STMT/stmt046;lang/STMT/stmt047$(Q)
    COMPILER_LANG_STMT_TESTS_GROUP2=$(Q)lang/STMT/stmt048;lang/STMT/stmt049;lang/STMT/stmt050;lang/STMT/stmt051;lang/STMT/stmt052;lang/STMT/stmt053;lang/STMT/stmt054;lang/STMT/stmt055;lang/STMT/stmt056;lang/STMT/stmt057;lang/STMT/stmt058;lang/STMT/stmt059;lang/STMT/stmt060;lang/STMT/stmt061;lang/STMT/stmt062;lang/STMT/stmt063;lang/STMT/stmt064;lang/STMT/stmt065;lang/STMT/stmt066;lang/STMT/stmt067;lang/STMT/stmt068;lang/STMT/stmt069;lang/STMT/stmt070;lang/STMT/stmt071;lang/STMT/stmt072;lang/STMT/stmt073;lang/STMT/stmt074;lang/STMT/stmt075;lang/STMT/stmt076;lang/STMT/stmt077;lang/STMT/stmt078;lang/STMT/stmt079;lang/STMT/stmt080;lang/STMT/stmt081;lang/STMT/stmt082;lang/STMT/stmt083;lang/STMT/stmt084;lang/STMT/stmt085;lang/STMT/stmt086;lang/STMT/stmt087;lang/STMT/stmt088;lang/STMT/stmt089;lang/STMT/stmt090;lang/STMT/stmt091;lang/STMT/stmt092;lang/STMT/stmt093;lang/STMT/stmt094;lang/STMT/stmt095$(Q)