[tests] update some old JVM output paths

Ilir-Liburn · May 17, 2020 · 5ce697e · 5ce697e
1 parent 5118653
commit 5ce697e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 20 deletions.
diff --git a/tests/sys/genTestRes.py b/tests/sys/genTestRes.py
@@ -83,7 +83,6 @@
       ("../../bin/lua/UtilityProcess.lua", "bin-lua"),
       ("../../bin/java/UtilityProcess-Debug.jar", "bin-java-debug"),
       ("../../bin/java/UtilityProcess.jar", "bin-java"),
-      ("../../bin/jvm/UtilityProcess-Debug.jar", "bin-jvm-debug"),
       ("../../bin/jvm/UtilityProcess.jar", "bin-jvm"),
       ("../../bin/neko/UtilityProcess.n", "bin-neko"),
       ("../../bin/php/UtilityProcess/index.php", "bin-php"),

diff --git a/tests/sys/src/ExitCode.hx b/tests/sys/src/ExitCode.hx
@@ -25,12 +25,8 @@ class ExitCode {
 		#else
 			"bin/cs/bin/ExitCode.exe";
 		#end
-	#elseif (java && jvm)
-		#if debug
-			"bin/jvm/ExitCode-Debug.jar";
-		#else
-			"bin/jvm/ExitCode.jar";
-		#end
+	#elseif jvm
+		"bin/jvm/ExitCode.jar";
 	#elseif java
 		#if debug
 			"bin/java/ExitCode-Debug.jar";

diff --git a/tests/sys/src/TestArguments.hx b/tests/sys/src/TestArguments.hx
@@ -85,12 +85,8 @@ class TestArguments extends utest.Test {
 		#else
 			"bin/cs/bin/TestArguments.exe";
 		#end
-	#elseif (java && jvm)
-		#if debug
-			"bin/jvm/TestArguments-Debug.jar";
-		#else
-			"bin/jvm/TestArguments.jar";
-		#end
+	#elseif jvm
+		"bin/jvm/TestArguments.jar";
 	#elseif java
 		#if debug
 			"bin/java/TestArguments-Debug.jar";

diff --git a/tests/sys/src/TestSys.hx b/tests/sys/src/TestSys.hx
@@ -37,6 +37,8 @@ class TestSys extends TestCommandBase {
 			}
 		#elseif cs
 			Assert.isTrue(StringTools.endsWith(p, "Main-Debug.exe"));
+		#elseif jvm
+			Assert.isTrue(StringTools.endsWith(p, "sys.jar"))
 		#elseif java
 			Assert.isTrue(StringTools.endsWith(p, "Main-Debug.jar"));
 		#elseif python

diff --git a/tests/sys/src/TestUnicode.hx b/tests/sys/src/TestUnicode.hx
@@ -26,12 +26,8 @@ class TestUnicode extends utest.Test {
 		"bin-hl";
 #elseif lua
 		"bin-lua";
-#elseif (java && jvm)
-		#if debug
-			"bin-jvm-debug";
-		#else
-			"bin-jvm";
-		#end
+#elseif jvm
+		"bin-jvm";
 #elseif java
 		#if debug
 			"bin-java-debug";

diff --git a/tests/sys/src/UtilityProcess.hx b/tests/sys/src/UtilityProcess.hx
@@ -16,7 +16,7 @@ class UtilityProcess {
 		Path.join(["bin", "hl"]);
 #elseif lua
 		Path.join(["bin", "lua"]);
-#elseif (java && jvm)
+#elseif jvm
 		Path.join(["bin", "jvm"]);
 #elseif java
 		Path.join(["bin", "java"]);
@@ -48,6 +48,8 @@ class UtilityProcess {
 		"UtilityProcess.hl";
 #elseif lua
 		"UtilityProcess.lua";
+#elseif jvm
+		"UtilityProcess.jar";
 #elseif java
 		#if debug
 			"UtilityProcess-Debug.jar";