Merge pull request adoptium#149 from renfeiw/vendor

Add feature to disable vendor

Author: Shelley Lambert

scripts/testBot/disable.py

@@ -38,6 +38,8 @@ def main():
                     newArgs["file"] = m.group(1)
                 elif m := re.match(r"impl=(\S+)", op):
                     newArgs["impl"] = m.group(1)
+                elif m := re.match(r"vendor=(\S+)", op):
+                    newArgs["vendor"] = m.group(1)
                 elif m := re.match(r"ver=(\S+)", op):
                     newArgs["ver"] = m.group(1)
                 elif m := re.match(r"plat=(\S+)", op):

scripts/testBot/playlistModifier.py

@@ -28,6 +28,7 @@ def main():
     ap.add_argument("-t", "--test", required=False, help="test name")
     ap.add_argument("-v", "--ver", required=False, help="java version")
     ap.add_argument("-i", "--impl", required=False, help="java impl")
+    ap.add_argument("-vd", "--vendor", required=False, help="java vendor")
     ap.add_argument("-p", "--plat", required=False, help="platform")
     ap.add_argument("-c", "--comment", required=False, help="comment")
     run(vars(ap.parse_args()))
@@ -92,6 +93,10 @@ def addDisabled(files, args):
                 implEle = etree.Element("impl")
                 implEle.text = args["impl"]
                 disabled.append(implEle)
+            if "vendor" in args:
+                vendorEle = etree.Element("vendor")
+                vendorEle.text = args["vendor"]
+                disabled.append(vendorEle)
             if "plat" in args:
                 platEle = etree.Element("plat")
                 platEle.text = args["plat"]

src/org/testKitGen/TestInfoParser.java

@@ -188,13 +188,15 @@ 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 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)) 
-					&& ((subset == null) || checkJavaVersion(subset)) 
+				if (((impl == null) || arg.getImpl().equals(impl))
+					&& ((vendor == null) || arg.getVendor().equals(vendor))
+					&& ((subset == null) || checkJavaVersion(subset))
 					&& ((plat == null) || checkPlat(plat))
 					&& ((variation == null) || var.getVariation().equals(variation))) {
 					var.addDisabledReasons(comment);