clean up unit hxmls

tests/runci/targets/Jvm.hx

@@ -14,16 +14,16 @@ class Jvm {
 
 		for (level in 0...3) {
 			final args = args.concat(["-D", "jvm.dynamic-level=" + level]);
-			runCommand("haxe", ["compile-jvm-only.hxml", "--times"].concat(args));
+			runCommand("haxe", ["compile-jvm-only.hxml", "--hxb", "bin/hxb/jvm.zip"].concat(args));
 			runCommand("java", ["-jar", "bin/unit.jar"]);
 
-			runCommand("haxe", ["compile-hxb-jvm-read.hxml", "--times"].concat(args));
+			runCommand("haxe", ["compile-jvm-only.hxml", "--hxb-lib", "bin/hxb/jvm.zip"].concat(args));
 			runCommand("java", ["-jar", "bin/unit.jar"]);
 
 			runCommand("haxe", ["compile-jvm-only.hxml","-dce","no"].concat(args));
 			runCommand("java", ["-jar", "bin/unit.jar"]);
 
-			runCommand("haxe", ["compile-hxb-jvm-read.hxml"].concat(args));
+			runCommand("haxe", ["compile-jvm-only.hxml", "--hxb-lib", "bin/hxb/jvm.zip"].concat(args));
 			runCommand("java", ["-jar", "bin/unit.jar"]);
 		}
 

tests/runci/targets/Macro.hx

@@ -5,10 +5,8 @@ import runci.Config.*;
 
 class Macro {
 	static public function run(args:Array<String>) {
-		runCommand("haxe", ["compile-hxb-interp.hxml"].concat(args));
-		runCommand("haxe", ["compile-hxb-interp-read.hxml"].concat(args));
-
-		runCommand("haxe", ["compile-macro.hxml"].concat(args));
+		runCommand("haxe", ["compile-macro.hxml", "--hxb", "bin/hxb/eval.zip"].concat(args));
+		runCommand("haxe", ["compile-macro.hxml", "--hxb-lib", "bin/hxb/eval.zip"].concat(args));
 
 		changeDirectory(displayDir);
 		haxelibInstallGit("Simn", "haxeserver");

tests/unit/compile-hxb-interp-read.hxml

@@ -1,20 +0,0 @@
--D source-header=
---debug
-# -p src
-# -cp "C:\Program Files\The Haxe Effect\src/dev/null"
---resource res1.txt@re/s?!%[]))("'1.txt
---resource res2.bin@re/s?!%[]))("'1.bin
---resource serializedValues.txt
---macro Macro.init()
---dce full
--lib utest
--D analyzer-optimize
--D analyzer-user-var-fusion
--D message.reporting=pretty
--D haxe-next
-# compile-each.hxml
-
---main unit.TestMain
---interp
-# --hxb bin/hxb
---hxb-lib bin/hxb/eval.zip

tests/unit/compile-hxb-interp-roundtrip.hxml

@@ -0,0 +1,7 @@
+compile-macro.hxml
+--hxb bin/hxb/eval.zip
+
+--next
+
+compile-macro.hxml
+--hxb-lib bin/hxb/eval.zip

tests/unit/compile-hxb-interp.hxml

@@ -1,4 +0,0 @@
-compile-each.hxml
---main unit.TestMain
---interp
---hxb bin/hxb/eval.zip

tests/unit/compile-hxb-jvm-read.hxml

@@ -1,20 +0,0 @@
--D source-header=
---debug
-# -p src
-# -cp "C:\Program Files\The Haxe Effect\src/dev/null"
---resource res1.txt@re/s?!%[]))("'1.txt
---resource res2.bin@re/s?!%[]))("'1.bin
---resource serializedValues.txt
---macro Macro.init()
---dce full
--lib utest
--D analyzer-optimize
--D analyzer-user-var-fusion
--D message.reporting=pretty
--D haxe-next
-
---main unit.TestMain
---java-lib native_java/native.jar
---jvm bin/unit.jar
--D jvm.compression-level=0
---hxb-lib bin/hxb/jvm.zip

tests/unit/compile-hxb-jvm-roundtrip.hxml

@@ -0,0 +1,7 @@
+compile-jvm-only.hxml
+--hxb bin/hxb/jvm.zip
+
+--next
+
+compile-jvm-only.hxml
+--hxb-lib bin/hxb/jvm.zip

tests/unit/compile-hxb-roundtrip.hxml

@@ -1,5 +0,0 @@
-compile-hxb-interp.hxml
-
---next
-
-compile-hxb-interp-read.hxml

tests/unit/compile-jvm-only.hxml

@@ -2,5 +2,4 @@ compile-each.hxml
 --main unit.TestMain
 --java-lib native_java/native.jar
 --jvm bin/unit.jar
--D jvm.compression-level=0
---hxb bin/hxb/jvm.zip
+-D jvm.compression-level=0