Consume vendor specific exclude list

Signed-off-by: Mesbah-Alam <Mesbah_Alam@ca.ibm.com>
adoptium · Aug 30, 2022 · 8098262 · 8098262
1 parent d4a993c
commit 8098262
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/jck/jtrunner/JavaTestRunner.java b/jck/jtrunner/JavaTestRunner.java
@@ -63,6 +63,7 @@ public class JavaTestRunner {
 	private static String jckConfigLoc;
 	private static String initialJtxFullPath;
 	private static String jtxFullPath;
+	private static String jtxDevFullPath;
 	private static String kflFullPath;
 	private static String testFlagJtxFullPath;
 	private static String krbConfFile;
@@ -267,6 +268,16 @@ public static boolean generateJTB() throws Exception {
 			System.out.println("Unable to find additional excludes list file " + jtxFullPath);
 			jtxFullPath = "";
 		}
+
+		jtxDevFullPath = jckRoot + File.separator + "excludes" + File.separator + jckVersion + "-dev.jtx";
+		File jtxDevFile = new File(jtxDevFullPath);
+
+		if (jtxDevFile.exists()) {
+			System.out.println("Using additional excludes list file " + jtxDevFullPath);
+		} else {
+			System.out.println("Unable to find additional excludes list file " + jtxDevFullPath);
+			jtxDevFullPath = "";
+		}
 
 		// Look for a known failures list file
 		kflFullPath = jckRoot + File.separator + "excludes" + File.separator + jckVersion + ".kfl";
@@ -415,9 +426,9 @@ public static boolean generateJTB() throws Exception {
 		// Only use default initial jtx exclude and disregard the rest of jck exclude lists 
 		// when running a test via jck_custom.
 		if (task == null || !task.equals("custom")) {  
-			fileContent += "set jck.excludeList.customFiles \"" + initialJtxFullPath + " " + jtxFullPath + " " + kflFullPath + " " + testFlagJtxFullPath + "\";\n";
+			fileContent += "set jck.excludeList.customFiles \"" + initialJtxFullPath + " " + jtxFullPath + " " + jtxDevFullPath + " " + kflFullPath + " " + testFlagJtxFullPath + "\";\n";
 		} else {
-			fileContent += "set jck.excludeList.customFiles \"" + initialJtxFullPath + " " + jtxFullPath + " " + kflFullPath + "\";\n";
+			fileContent += "set jck.excludeList.customFiles \"" + initialJtxFullPath + " " + jtxFullPath + " " + jtxDevFullPath + " " + kflFullPath + "\";\n";
 		}
 
 		fileContent += "runTests" + ";\n";