Browse Source

[tests] align JVM CLI usage with other targets

also fixes the test failure caused by `debug` vs `Debug` casing
Jens Fischer 5 years ago
parent
commit
95f12477e8

+ 1 - 2
extra/all.hxml

@@ -33,8 +33,7 @@
 -xml java.xml
 -xml java.xml
 
 
 --next
 --next
--java all_jvm
--D jvm
+--jvm all_jvm
 -xml jvm.xml
 -xml jvm.xml
 
 
 --next
 --next

+ 1 - 1
tests/benchs/.vscode/settings.json

@@ -13,7 +13,7 @@
 		{"label": "PHP", "args": ["build.hxml", "-php", "export/php", "-cmd", "C:\\WINDOWS\\Sysnative\\bash.exe -c 'php export/php/index.php'"]},
 		{"label": "PHP", "args": ["build.hxml", "-php", "export/php", "-cmd", "C:\\WINDOWS\\Sysnative\\bash.exe -c 'php export/php/index.php'"]},
 		{"label": "PHP 7", "args": ["build.hxml", "-php", "export/php", "-D", "php7", "-cmd", "C:\\WINDOWS\\Sysnative\\bash.exe -c 'php7.0 export/php/index.php'"]},
 		{"label": "PHP 7", "args": ["build.hxml", "-php", "export/php", "-D", "php7", "-cmd", "C:\\WINDOWS\\Sysnative\\bash.exe -c 'php7.0 export/php/index.php'"]},
 		{"label": "Java", "args": ["build.hxml", "-java", "export/java", "-cmd", "java -jar export/java/Main.jar"]},
 		{"label": "Java", "args": ["build.hxml", "-java", "export/java", "-cmd", "java -jar export/java/Main.jar"]},
-		{"label": "Jvm", "args": ["build.hxml", "-D", "jvm", "-java", "export/java", "-cmd", "java -jar export/java/Main.jar"]},
+		{"label": "JVM", "args": ["build.hxml", "--jvm", "export/run.jar", "-cmd", "java -jar export/run.jar"]},
 		{"label": "C#", "args": ["build.hxml", "-cs", "export/cs", "-cmd", "cmd /C export\\cs\\bin\\Main.exe"]},
 		{"label": "C#", "args": ["build.hxml", "-cs", "export/cs", "-cmd", "cmd /C export\\cs\\bin\\Main.exe"]},
 		{"label": "Interp", "args": ["build.hxml", "--interp"]},
 		{"label": "Interp", "args": ["build.hxml", "--interp"]},
 	],
 	],

+ 2 - 4
tests/benchs/mandelbrot/compile-jvm.hxml

@@ -1,9 +1,7 @@
 --main Mandelbrot
 --main Mandelbrot
--java bin/jvm
--D jvm
+--jvm bin/Mandelbrot.jar
 
 
 --next
 --next
 --main Mandelbrot
 --main Mandelbrot
--java bin/jvm-anon
+--jvm bin/Mandelbrot-anon.jar
 -D anon_objects
 -D anon_objects
--D jvm

+ 1 - 2
tests/misc/java/projects/Issue9210/compile.hxml

@@ -1,5 +1,4 @@
---java bin
--D jvm
+--jvm bin/haxe.jar
 haxe.ds.Option
 haxe.ds.Option
 
 
 --next
 --next

+ 5 - 5
tests/runci/targets/Jvm.hx

@@ -6,19 +6,19 @@ import runci.Config.*;
 class Jvm {
 class Jvm {
 	static public function run(args:Array<String>) {
 	static public function run(args:Array<String>) {
 		runCommand("haxe", ["compile-jvm.hxml"].concat(args));
 		runCommand("haxe", ["compile-jvm.hxml"].concat(args));
-		runCommand("java", ["-jar", "bin/jvm/TestMain-Debug.jar"]);
+		runCommand("java", ["-jar", "bin/unit.jar"]);
 
 
 		runCommand("haxe", ["compile-jvm.hxml","-dce","no"].concat(args));
 		runCommand("haxe", ["compile-jvm.hxml","-dce","no"].concat(args));
-		runCommand("java", ["-jar", "bin/jvm/TestMain-Debug.jar"]);
+		runCommand("java", ["-jar", "bin/unit.jar"]);
 
 
 		changeDirectory(sysDir);
 		changeDirectory(sysDir);
 		runCommand("haxe", ["compile-jvm.hxml"].concat(args));
 		runCommand("haxe", ["compile-jvm.hxml"].concat(args));
-		runCommand("java", ["-jar", "bin/jvm/Main-Debug.jar"]);
+		runCommand("java", ["-jar", "bin/jvm/sys.jar"]);
 
 
 		changeDirectory(threadsDir);
 		changeDirectory(threadsDir);
-		runCommand("haxe", ["build.hxml", "-java", "export/jvm", "-D", "jvm"].concat(args));
+		runCommand("haxe", ["build.hxml", "--jvm", "export/threads.jar"].concat(args));
 		if (systemName != "Windows") { // #8154
 		if (systemName != "Windows") { // #8154
-			runCommand("java", ["-jar", "export/jvm/Main.jar"]);
+			runCommand("java", ["-jar", "export/threads.jar"]);
 		}
 		}
 	}
 	}
 }
 }

+ 4 - 8
tests/sys/compile-jvm.hxml

@@ -1,22 +1,18 @@
 compile-each.hxml
 compile-each.hxml
 --main Main
 --main Main
--java bin/jvm
--D jvm
+--jvm bin/jvm/sys.jar
 
 
 --next
 --next
 compile-each.hxml
 compile-each.hxml
 --main TestArguments
 --main TestArguments
--java bin/jvm
--D jvm
+--jvm bin/jvm/TestArguments.jar
 
 
 --next
 --next
 compile-each.hxml
 compile-each.hxml
 --main ExitCode
 --main ExitCode
--java bin/jvm
--D jvm
+--jvm bin/jvm/ExitCode.jar
 
 
 --next
 --next
 compile-each.hxml
 compile-each.hxml
 --main UtilityProcess
 --main UtilityProcess
--java bin/jvm
--D jvm
+--jvm bin/jvm/UtilityProcess.jar

+ 1 - 1
tests/unit/compile-jvm.hxml

@@ -6,4 +6,4 @@
 compile-each.hxml
 compile-each.hxml
 --main unit.TestMain
 --main unit.TestMain
 --java-lib native_java/native.jar
 --java-lib native_java/native.jar
---jvm bin/jvm/TestMain-debug.jar
+--jvm bin/unit.jar