فهرست منبع

move split misc/projects across appropriate targets

Aleksandr Kuzmenko 6 سال پیش
والد
کامیت
51169cc59c

+ 0 - 0
tests/misc/csTwoLibs/.gitignore → tests/misc/cs/csTwoLibs/.gitignore


+ 0 - 0
tests/misc/csTwoLibs/Lib1.hx → tests/misc/cs/csTwoLibs/Lib1.hx


+ 0 - 0
tests/misc/csTwoLibs/Main.hx → tests/misc/cs/csTwoLibs/Main.hx


+ 0 - 0
tests/misc/csTwoLibs/compile-1.hxml → tests/misc/cs/csTwoLibs/compile-1.hxml


+ 0 - 0
tests/misc/csTwoLibs/compile-2.hxml → tests/misc/cs/csTwoLibs/compile-2.hxml


+ 0 - 0
tests/misc/csTwoLibs/compile-3.hxml → tests/misc/cs/csTwoLibs/compile-3.hxml


+ 0 - 0
tests/misc/csTwoLibs/compile-4.hxml → tests/misc/cs/csTwoLibs/compile-4.hxml


+ 2 - 0
tests/misc/cs/run.hxml

@@ -0,0 +1,2 @@
+-cp ../src
+--run Main

+ 0 - 0
tests/misc/pythonImport/.gitignore → tests/misc/python/pythonImport/.gitignore


+ 0 - 0
tests/misc/pythonImport/Main.hx → tests/misc/python/pythonImport/Main.hx


+ 0 - 0
tests/misc/pythonImport/compile.hxml → tests/misc/python/pythonImport/compile.hxml


+ 0 - 0
tests/misc/pythonImport/native_python/__init__.py → tests/misc/python/pythonImport/native_python/__init__.py


BIN
tests/misc/python/pythonImport/native_python/__pycache__/__init__.cpython-36.pyc


BIN
tests/misc/python/pythonImport/native_python/__pycache__/__init__.pypy3-24.pyc


BIN
tests/misc/python/pythonImport/native_python/__pycache__/sample.cpython-36.pyc


BIN
tests/misc/python/pythonImport/native_python/__pycache__/sample.pypy3-24.pyc


+ 0 - 0
tests/misc/pythonImport/native_python/sample.py → tests/misc/python/pythonImport/native_python/sample.py


+ 2 - 0
tests/misc/python/run.hxml

@@ -0,0 +1,2 @@
+-cp ../src
+--run Main

+ 7 - 1
tests/runci/targets/Cs.hx

@@ -5,6 +5,9 @@ import runci.System.*;
 import runci.Config.*;
 
 class Cs {
+	static var miscCsDir(get,never):String;
+	static inline function get_miscCsDir() return miscDir + 'cs/';
+
 	static public function getCsDependencies() {
 		switch (systemName) {
 			case "Linux":
@@ -76,7 +79,10 @@ class Cs {
 		// runCommand("haxe", ["build.hxml", "-cs", "export/cs"]);
 		// runCs("export/cs/bin/Main.exe");
 
-		changeDirectory(miscDir + "csTwoLibs");
+		changeDirectory(miscCsDir);
+		runCommand("haxe", ["run.hxml"]);
+
+		changeDirectory(miscCsDir + "csTwoLibs");
 		for (i in 1...5)
 		{
 			runCommand("haxe", ['compile-$i.hxml','-D','fast_cast']);

+ 0 - 4
tests/runci/targets/Macro.hx

@@ -3,8 +3,6 @@ package runci.targets;
 import sys.FileSystem;
 import runci.System.*;
 import runci.Config.*;
-import runci.targets.Cs.*;
-import runci.targets.Python.*;
 
 class Macro {
 	static public function run(args:Array<String>) {
@@ -24,8 +22,6 @@ class Macro {
 		runCommand("haxe", ["test-js-es6.hxml"]);
 
 		changeDirectory(miscDir);
-		getCsDependencies();
-		getPythonDependencies();
 		runCommand("haxe", ["compile.hxml"]);
 
 		changeDirectory(sysDir);

+ 7 - 1
tests/runci/targets/Python.hx

@@ -5,6 +5,9 @@ import runci.System.*;
 import runci.Config.*;
 
 class Python {
+	static var miscPythonDir(get,never):String;
+	static inline function get_miscPythonDir() return miscDir + 'python/';
+
 	static public function getPythonDependencies():Array<String> {
 		switch (systemName) {
 			case "Linux":
@@ -68,7 +71,10 @@ class Python {
 			runCommand(py, ["bin/python/sys.py"]);
 		}
 
-		changeDirectory(miscDir + "pythonImport");
+		changeDirectory(miscPythonDir);
+		runCommand("haxe", ["run.hxml"]);
+
+		changeDirectory(miscPythonDir + "pythonImport");
 		runCommand("haxe", ["compile.hxml"]);
 		for (py in pys) {
 			runCommand(py, ["test.py"]);