Merge pull request #6997 from renfeiw/tkg4

Fix Option issue in TKGJ
eclipse-openj9 · Sep 9, 2019 · 7abd14e · 7abd14e
2 parents 92ad03e + 5672b83
commit 7abd14e
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/test/TestConfig/TKGJ/src/org/testKitGen/Options.java b/test/TestConfig/TKGJ/src/org/testKitGen/Options.java
@@ -80,21 +80,24 @@ public static String getTestFlag() {
 
 	public static void parse(String[] args) {
 		for (int i = 0; i < args.length; i++) {
-			String arg = args[i].toLowerCase();
-			if (arg.startsWith("--spec=")) {
-				spec = arg.substring(arg.indexOf("=") + 1);
-			} else if (arg.startsWith("--jdkversion=")) {
-				jdkVersion = arg.substring(arg.indexOf("=") + 1);
-			} else if (arg.startsWith("--impl=")) {
-				impl = arg.substring(arg.indexOf("=") + 1);
-			} else if (arg.startsWith("--projectrootdir=")) {
+			String arg = args[i];
+			String arglc = arg.toLowerCase();
+			if (arglc.startsWith("--spec=")) {
+				spec = arglc.substring(arg.indexOf("=") + 1);
+			} else if (arglc.startsWith("--jdkversion=")) {
+				jdkVersion = arglc.substring(arg.indexOf("=") + 1);
+			} else if (arglc.startsWith("--impl=")) {
+				impl = arglc.substring(arg.indexOf("=") + 1);
+			} else if (arglc.startsWith("--projectrootdir=")) {
+				// projectRootDir is case sensitive
 				projectRootDir = arg.substring(arg.indexOf("=") + 1);
-			} else if (arg.startsWith("--buildlist=")) {
+			} else if (arglc.startsWith("--buildlist=")) {
+				// buildList is case sensitive
 				buildList = arg.substring(arg.indexOf("=") + 1);
-			} else if (arg.startsWith("--iterations=")) {
-				iterations = arg.substring(arg.indexOf("=") + 1);
-			} else if (arg.startsWith("--testflag=")) {
-				testFlag = arg.substring(arg.indexOf("=") + 1);
+			} else if (arglc.startsWith("--iterations=")) {
+				iterations = arglc.substring(arg.indexOf("=") + 1);
+			} else if (arglc.startsWith("--testflag=")) {
+				testFlag = arglc.substring(arg.indexOf("=") + 1);
 			} else {
 				System.err.println("Invalid option " + args[i]);
 				System.err.println(usage);