Convert subset to version

- support both at this moment

Signed-off-by: renfeiw <[email protected]>

Author: renfeiw

README.md

@@ -5,4 +5,4 @@ TestKitGen (TKG) is a lightweight test harness for bringing together a diverse s
 TKG standardizes: 
 - test target generation (generates make targets based on contents of playlist.xml files)
 - test output, defaulting to Test Anything Protocol (TAP) as the simplest, lowest common denominator
-- the way tests are tagged, grouped, included and excluded (categorizing by elements in the playlist file, by group, impl, subset (version), etc)
+- the way tests are tagged, grouped, included and excluded (categorizing by elements in the playlist file, by group, impl, version, etc)

playlist.xsd

@@ -70,10 +70,10 @@
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>
-              <xs:element name="subsets" minOccurs="0">
+              <xs:element name="versions" minOccurs="0">
                 <xs:complexType>
                   <xs:sequence>
-                    <xs:element type="xs:string" name="subset" maxOccurs="unbounded"/>
+                    <xs:element type="xs:string" name="version" maxOccurs="unbounded"/>
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>

scripts/testBot/playlistModifier.py

@@ -86,7 +86,7 @@ def addDisabled(files, args):
                     print(f"Could not find test case {testCaseName}_{nthVar} (i.e., the {nthVar + 1}th variation for test {testCaseName})!")
                     sys.exit(-1)
             if "ver" in args:
-                verEle = etree.Element("subset")
+                verEle = etree.Element("version")
                 verEle.text = args["ver"]
                 disabled.append(verEle)
             if "impl" in args:

src/org/testKitGen/TestInfoParser.java

@@ -52,17 +52,21 @@ public TestInfo parse() {
 		boolean isValidVendor = (vendors.size() == 0) || vendors.contains(arg.getVendor());
 		if (!isValidVendor) return null;
 
-		// Do not generate make target if subset doesn't match the exported jdk_version
-		List<String> subsets = new ArrayList<String>();
-		getElements(subsets, "subsets", "subset", null, ti.getTestCaseName());
-		boolean isValidSubset = subsets.size() == 0;
-		for (String subset : subsets) {
-			isValidSubset = checkJavaVersion(subset);
-			if (isValidSubset) {
+		// Do not generate make target if version doesn't match the exported jdk_version
+		List<String> versions = new ArrayList<String>();
+		getElements(versions, "versions", "version", null, ti.getTestCaseName());
+		//TODO: remove temporarily support for old style
+		if (versions.size() == 0) {
+			getElements(versions, "subsets", "subset", null, ti.getTestCaseName());
+		}
+		boolean isValidVersion = versions.size() == 0;
+		for (String version : versions) {
+			isValidVersion = checkJavaVersion(version);
+			if (isValidVersion) {
 				break;
 			}
 		}
-		if (!isValidSubset) return null;
+		if (!isValidVersion) return null;
 
 		// Do not generate make target if the test is AOT not applicable when test flag
 		// is set to AOT
@@ -189,14 +193,18 @@ private void parseDisableInfo(TestInfo ti) {
 
 			String impl = getDisabledEle(disabled, "impl", ti.getTestCaseName());
 			String vendor = getDisabledEle(disabled, "vendor", ti.getTestCaseName());
-			String subset = getDisabledEle(disabled, "subset", ti.getTestCaseName());
+			String version = getDisabledEle(disabled, "version", ti.getTestCaseName());
+			//TODO: remove temporarily support for old style
+			if (version == null) {
+				version = getDisabledEle(disabled, "subset", ti.getTestCaseName());
+			}
 			String plat = getDisabledEle(disabled, "plat", ti.getTestCaseName());
 			String variation = getDisabledEle(disabled, "variation", ti.getTestCaseName());
 
 			for (Variation var : ti.getVars()) {
 				if (((impl == null) || arg.getImpl().equals(impl))
 					&& ((vendor == null) || arg.getVendor().equals(vendor))
-					&& ((subset == null) || checkJavaVersion(subset))
+					&& ((version == null) || checkJavaVersion(version))
 					&& ((plat == null) || checkPlat(plat))
 					&& ((variation == null) || var.getVariation().equals(variation))) {
 					var.addDisabledReasons(comment);