restructure unit tests: sources in src, output in bin

.gitignore

@@ -58,7 +58,7 @@ build.bat
 tests/unit/compile.php.hxml
 /extra/*.xml
 tests/optimization/testopt.js
-tests/unit/native_python/__pycache__
+tests/misc/pythonImport/native_python/__pycache__
 tests/unit/unit.py
 tests/unit/unit.py.res1.txt
 tests/unit/unit.py.res2.bin
@@ -66,3 +66,4 @@ tests/unit/unit.py.res2.bin
 tests/sys/bin/
 tests/optimization/dump/
 tests/misc/projects/Issue3102/test.n
+tests/unit/bin/

common.ml

@@ -956,8 +956,11 @@ let rec mkdir_recursive base dir_list =
 
 let mkdir_from_path path =
 	let parts = Str.split_delim (Str.regexp "[\\/]+") path in
-	let dir_list = List.rev (List.tl (List.rev parts)) in
-	mkdir_recursive "" dir_list
+	match parts with
+		| [] -> (* path was "" *) ()
+		| _ ->
+			let dir_list = List.rev (List.tl (List.rev parts)) in
+			mkdir_recursive "" dir_list
 
 let mem_size v =
 	Objsize.size_with_headers (Objsize.objsize v [] [])

main.ml

@@ -1487,6 +1487,11 @@ try
 		if Common.defined com Define.Dump then Codegen.dump_types com;
 		if Common.defined com Define.DumpDependencies then Codegen.dump_dependencies com;
 		t();
+		if not !no_output then begin match com.platform with
+			| Neko when !interp -> ()
+			| Cpp | Cs | Java | Php -> Common.mkdir_from_path (com.file ^ "/.")
+			| _ -> Common.mkdir_from_path com.file
+		end;
 		(match com.platform with
 		| _ when !no_output ->
 			if !interp then begin

tests/RunTravis.hx

@@ -413,7 +413,7 @@ class RunTravis {
 				//}
 			case Neko:
 				runCommand("haxe", ["compile-neko.hxml","-D","travis"]);
-				runCommand("neko", ["unit.n"]);
+				runCommand("neko", ["bin/unit.n"]);
 
 				changeDirectory(sysDir);
 				runCommand("haxe", ["compile-neko.hxml","-D","travis"]);
@@ -422,25 +422,29 @@ class RunTravis {
 			case Php:
 				getPhpDependencies();
 				runCommand("haxe", ["compile-php.hxml","-D","travis"]);
-				runCommand("php", ["php/index.php"]);
+				runCommand("php", ["bin/php/index.php"]);
 			case Python:
 				getPythonDependencies();
 				runCommand("haxe", ["compile-python.hxml","-D","travis"]);
-				runCommand("python3", ["unit.py"]);
+				runCommand("python3", ["bin/unit.py"]);
 
 				changeDirectory(sysDir);
 				runCommand("haxe", ["compile-python.hxml","-D","travis"]);
 				changeDirectory("bin/python");
 				runCommand("python3", ["sys.py"].concat(args));
+
+				changeDirectory(miscDir + "pythonImport");
+				runCommand("haxe", ["compile.hxml"]);
+				runCommand("python3", ["test.py"]);
 			case Cpp:
 				getCppDependencies();
 				runCommand("haxe", ["compile-cpp.hxml","-D","travis"]);
-				runCommand("./cpp/Test-debug", []);
+				runCommand("./bin/cpp/Test-debug", []);
 
 				runCommand("rm", ["-rf", "cpp"]);
 
 				runCommand("haxe", ["compile-cpp.hxml", "-D", "HXCPP_M64","-D","travis"]);
-				runCommand("./cpp/Test-debug", []);
+				runCommand("./bin/cpp/Test-debug", []);
 
 				changeDirectory(sysDir);
 				runCommand("haxe", ["compile-cpp.hxml","-D","travis"]);
@@ -451,7 +455,7 @@ class RunTravis {
 
 				for (flatten in [true, false]) {
 					runCommand("haxe", ["compile-js.hxml","-D","travis"].concat(flatten ? ["-D", "js-flatten"] : []));
-					runCommand("node", ["-e", "var unit = require('./unit.js').unit; unit.Test.main(); process.exit(unit.Test.success ? 0 : 1);"]);
+					runCommand("node", ["-e", "var unit = require('./bin/unit.js').unit; unit.Test.main(); process.exit(unit.Test.success ? 0 : 1);"]);
 				}
 
 				if (Sys.getEnv("TRAVIS_SECURE_ENV_VARS") == "true" && systemName == "Linux") {
@@ -473,23 +477,23 @@ class RunTravis {
 			case Java:
 				getJavaDependencies();
 				runCommand("haxe", ["compile-java.hxml","-D","travis"]);
-				runCommand("java", ["-jar", "java/Test-Debug.jar"]);
+				runCommand("java", ["-jar", "bin/java/Test-Debug.jar"]);
 			case Cs:
 				getCsDependencies();
 
 				runCommand("haxe", ["compile-cs.hxml","-D","travis"]);
-				runCommand("mono", ["cs/bin/Test-Debug.exe"]);
+				runCommand("mono", ["bin/cs/bin/Test-Debug.exe"]);
 
 				runCommand("haxe", ["compile-cs-unsafe.hxml","-D","travis"]);
-				runCommand("mono", ["cs_unsafe/bin/Test-Debug.exe"]);
+				runCommand("mono", ["bin/cs_unsafe/bin/Test-Debug.exe"]);
 			case Flash9:
 				setupFlashPlayerDebugger();
 				runCommand("haxe", ["compile-flash9.hxml", "-D", "fdb","-D","travis"]);
-				runFlash("unit9.swf");
+				runFlash("bin/unit9.swf");
 			case Flash8:
 				setupFlashPlayerDebugger();
 				runCommand("haxe", ["compile-flash8.hxml", "-D", "fdb","-D","travis"]);
-				runFlash("unit8.swf");
+				runFlash("bin/unit8.swf");
 			case As3:
 				setupFlashPlayerDebugger();
 
@@ -506,7 +510,7 @@ class RunTravis {
 				runCommand("mxmlc", ["--version"]);
 
 				runCommand("haxe", ["compile-as3.hxml", "-D", "fdb","-D","travis"]);
-				runFlash("unit9_as3.swf");
+				runFlash("bin/unit9_as3.swf");
 			case ThirdParty:
 				getPhpDependencies();
 				getJavaDependencies();

tests/misc/pythonImport/.gitignore

@@ -0,0 +1 @@
+/test.py

tests/misc/pythonImport/Main.hx

@@ -0,0 +1,41 @@
+@:pythonImport("native_python.sample", "A")
+extern class ExternClass {
+    function new();
+    function f(v:Int):Int;
+}
+
+@:pythonImport("native_python.sample", "A.Nested")
+extern class ExternNestedClass {
+    function new();
+    function f(v:Int):Int;
+}
+
+@:pythonImport("native_python.sample")
+extern class ExternModule {
+    static function f(v:Int):Int;
+}
+
+@:pythonImport("inexistant", "AZAZA", ignoreError=true)
+extern class InexistantExtern1 {}
+
+@:pythonImport("inexistant", "AZAZA.ZAZA", ignoreError=true)
+extern class InexistantExtern2 {}
+
+@:pythonImport("inexistant", ignoreError=true)
+extern class InexistantExtern3 {}
+
+class Main extends haxe.unit.TestCase {
+
+    function testExtern() {
+        assertEquals(new ExternClass().f(1), 2);
+        assertEquals(new ExternNestedClass().f(1), 3);
+        assertEquals(ExternModule.f(1), 4);
+    }
+
+    static function main() {
+        var runner = new haxe.unit.TestRunner();
+        runner.add(new Main());
+        var code = runner.run() ? 0 : 1;
+        Sys.exit(code);
+    }
+}

tests/misc/pythonImport/compile.hxml

@@ -0,0 +1,2 @@
+-main Main
+-python test.py

tests/unit/compile-as3.hxml

@@ -1,4 +1,4 @@
 compile-each.hxml
 -main unit.Test
--as3 as3
--cmd mxmlc -static-link-runtime-shared-libraries=true -debug as3/__main__.as --output unit9_as3.swf
+-as3 bin/as3
+-cmd mxmlc -static-link-runtime-shared-libraries=true -debug bin/as3/__main__.as --output bin/unit9_as3.swf

tests/unit/compile-cpp.hxml

@@ -1,4 +1,4 @@
 compile-each.hxml
 -main unit.Test
--cpp cpp
+-cpp bin/cpp
 -D NO_PRECOMPILED_HEADERS

tests/unit/compile-cs-unsafe.hxml

@@ -6,5 +6,5 @@
 compile-each.hxml
 -main unit.Test
 -D unsafe
--cs cs_unsafe
+-cs bin/cs_unsafe
 -net-lib native_cs/bin/native_cs.dll

tests/unit/compile-cs.hxml

@@ -5,5 +5,5 @@
 
 compile-each.hxml
 -main unit.Test
--cs cs
+-cs bin/cs
 -net-lib native_cs/bin/native_cs.dll

tests/unit/compile-each.hxml

@@ -1,6 +1,6 @@
 -D macro-times
 -debug
--cp ..
+-cp src
 -cp "C:\Program Files\The Haxe Effect\src/dev/null"
 -resource res1.txt
 -resource res2.bin

tests/unit/compile-exe-runner.hxml

@@ -1,2 +1,3 @@
+-cp src
 -main RunExe
--neko runexe.n
+-neko bin/runexe.n

tests/unit/compile-flash8.hxml

@@ -2,4 +2,4 @@ compile-each.hxml
 -main unit.Test
 -swf-header 300:300:30:FFFFFF
 -swf-version 8
--swf unit8.swf
+-swf bin/unit8.swf

tests/unit/compile-flash9.hxml

@@ -1,4 +1,4 @@
 compile-each.hxml
 -main unit.Test
 -swf-version 11
--swf unit9.swf
+-swf bin/unit9.swf

tests/unit/compile-java-runner.hxml

@@ -1,2 +1,3 @@
+-cp src
 -main RunJava
--neko runjava.n
+-neko bin/runjava.n

tests/unit/compile-java.hxml

@@ -5,7 +5,7 @@
 
 compile-each.hxml
 -main unit.Test
--java java
+-java bin/java
 -java-lib native_java/native.jar
 -java-lib java_drivers/mysql-connector-java-5.1.32-bin.jar
 -java-lib java_drivers/sqlite-jdbc-3.7.2.jar

tests/unit/compile-js.hxml

@@ -1,3 +1,3 @@
 compile-each.hxml
 unit.Test
--js unit.js
+-js bin/unit.js

tests/unit/compile-neko.hxml

@@ -1,4 +1,4 @@
 compile-each.hxml
 -D neko_v2
 -main unit.Test
--neko unit.n
+-neko bin/unit.n

tests/unit/compile-php.hxml

@@ -1,3 +1,3 @@
 compile-each.hxml
 -main unit.Test
--php php
+-php bin/php

tests/unit/compile-python.hxml

@@ -1,3 +1,3 @@
 compile-each.hxml
 -main unit.Test
--python unit.py
+-python bin/unit.py

tests/unit/compile-remoting.hxml

@@ -1,3 +1,3 @@
--cp ..
+-cp src
 -main unit.RemotingServer
 -neko remoting.n

tests/unit/RunJava.hx → tests/unit/src/RunJava.hx

@@ -1,7 +1,7 @@
 class RunJava {
 
 	static function main() {
-		var p = new sys.io.Process("java", ["-jar", neko.Web.getCwd() + "/java/Test-Debug.jar"]);
+		var p = new sys.io.Process("java", ["-jar", neko.Web.getCwd() + "/bin/java/Test-Debug.jar"]);
 		if( neko.Web.isModNeko )
 			neko.Web.setHeader("Content-Type","text/plain");
 		try {

tests/unit/TestIssues.hx → tests/unit/src/unit/TestIssues.hx

@@ -4,7 +4,7 @@ using StringTools;
 
 class TestIssues {
 	macro static public function addIssueClasses() {
-		var dir = sys.FileSystem.readDirectory("issues");
+		var dir = sys.FileSystem.readDirectory("src/unit/issues");
 		var el = [];
 		function add(className:String) {
 			el.push(macro classes.push(new unit.issues.$className()));

tests/unit/TestPython.hx → tests/unit/src/unit/TestPython.hx

@@ -84,32 +84,6 @@ private class B extends A {
     public function new() {}
 }
 
-@:pythonImport("native_python.sample", "A")
-extern class ExternClass {
-	function new();
-	function f(v:Int):Int;
-}
-
-@:pythonImport("native_python.sample", "A.Nested")
-extern class ExternNestedClass {
-	function new();
-	function f(v:Int):Int;
-}
-
-@:pythonImport("native_python.sample")
-extern class ExternModule {
-	static function f(v:Int):Int;
-}
-
-@:pythonImport("inexistant", "AZAZA", ignoreError=true)
-extern class InexistantExtern1 {}
-
-@:pythonImport("inexistant", "AZAZA.ZAZA", ignoreError=true)
-extern class InexistantExtern2 {}
-
-@:pythonImport("inexistant", ignoreError=true)
-extern class InexistantExtern3 {}
-
 class TestPython extends Test {
 
 	public function testDoWhileAsExpression () {
@@ -386,11 +360,4 @@ class TestPython extends Test {
 		eq(t.length, 2);
 	}
 
-	function testExtern()
-	{
-		eq(new ExternClass().f(1), 2);
-		eq(new ExternNestedClass().f(1), 3);
-		eq(ExternModule.f(1), 4);
-	}
-
 }

tests/unit/TestSpecification.hx → tests/unit/src/unit/TestSpecification.hx

@@ -142,7 +142,7 @@ class RttiClass3 extends RttiClass1 {
 }
 
 #if !macro
-@:build(unit.UnitBuilder.build("unitstd"))
+@:build(unit.UnitBuilder.build("src/unitstd"))
 #end
 class TestSpecification extends Test {