Bläddra i källkod

[tests] merged eventLoop tests into new threads test suite

Aleksandr Kuzmenko 4 år sedan
förälder
incheckning
31cf52ff37

+ 0 - 2
tests/eventLoop/.gitignore

@@ -1,2 +0,0 @@
-bin/*
-dump/*

+ 0 - 5
tests/eventLoop/build.hxml

@@ -1,5 +0,0 @@
---class-path src
---main Main
---library utest
---dce full
--D analyzer-optimize

+ 0 - 11
tests/eventLoop/src/Main.hx

@@ -1,11 +0,0 @@
-import utest.ui.Report;
-import utest.Runner;
-
-function main() {
-	var runner = new Runner();
-	var report = Report.create(runner);
-	report.displayHeader = AlwaysShowHeader;
-	report.displaySuccessResults = NeverShowSuccessResults;
-	runner.addCases('cases');
-	runner.run();
-}

+ 0 - 3
tests/eventLoop/src/import.hx

@@ -1,3 +0,0 @@
-import utest.Assert.*;
-import utest.Async;
-import sys.thread.Thread;

+ 0 - 1
tests/runci/Config.hx

@@ -20,7 +20,6 @@ class Config {
 	static public final sourcemapsDir = cwd + "sourcemaps/";
 	static public final nullSafetyDir = cwd + "nullsafety/";
 	static public final threadsDir = cwd + "threads/";
-	static public final eventLoopDir = cwd + "eventLoop/";
 
 	static public final ci:Null<Ci> =
 		if (Sys.getEnv("TF_BUILD") == "True")

+ 0 - 6
tests/runci/targets/Cpp.hx

@@ -68,12 +68,6 @@ class Cpp {
 		runCommand("haxe", ["compile-cpp.hxml"].concat(args));
 		runCpp("bin/cpp/Main-debug", []);
 
-		if(testCompiled) {
-			changeDirectory(eventLoopDir);
-			runCommand("haxe", ["build.hxml", "--cpp", "bin/cpp", "--debug"].concat(args));
-			runCpp("bin/cpp/Main-debug", []);
-		}
-
 		changeDirectory(threadsDir);
 		runCommand("haxe", ["build.hxml", "-cpp", "export/cpp"]);
 		runCpp("export/cpp/Main");

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

@@ -66,10 +66,6 @@ class Cs {
 		runCommand("haxe", ["build.hxml", "-cs", "export/cs"]);
 		runCs("export/cs/bin/Main.exe");
 
-		changeDirectory(eventLoopDir);
-		runCommand("haxe", ["build.hxml", "--cs", "bin/cs"]);
-		runCs("bin/cs/bin/Main.exe");
-
 		changeDirectory(miscCsDir);
 		runCommand("haxe", ["run.hxml"]);
 

+ 3 - 3
tests/runci/targets/Hl.hx

@@ -72,9 +72,9 @@ class Hl {
         runCommand("haxe", ["compile-hl.hxml"].concat(args));
         runCommand(hlBinary, ["bin/unit.hl"]);
 
-		changeDirectory(threadsDir);
-		runCommand("haxe", ["build.hxml", "-hl", "export/threads.hl"]);
-		runCommand("hl", ["export/threads.hl"]);
+        changeDirectory(threadsDir);
+        runCommand("haxe", ["build.hxml", "-hl", "export/threads.hl"]);
+        runCommand("hl", ["export/threads.hl"]);
 
         changeDirectory(sysDir);
         runCommand("haxe", ["compile-hl.hxml"].concat(args));

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

@@ -31,10 +31,6 @@ class Java {
 		runCommand("haxe", ["compile-java.hxml"].concat(args));
 		runCommand("java", ["-jar", "bin/java/Main-Debug.jar"]);
 
-		changeDirectory(eventLoopDir);
-		runCommand("haxe", ["build.hxml", "-java", "bin/java"].concat(args));
-		runCommand("java", ["-jar", "bin/java/Main.jar"]);
-
 		changeDirectory(threadsDir);
 		runCommand("haxe", ["build.hxml", "-java", "export/java"].concat(args));
 		runCommand("java", ["-jar", "export/java/Main.jar"]);

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

@@ -18,10 +18,6 @@ class Jvm {
 		runCommand("haxe", ["compile-jvm.hxml"].concat(args));
 		runCommand("java", ["-jar", "bin/jvm/sys.jar"]);
 
-		changeDirectory(eventLoopDir);
-		runCommand("haxe", ["build.hxml", "--jvm", "bin/test.jar"].concat(args));
-		runCommand("java", ["-jar", "bin/test.jar"]);
-
 		changeDirectory(threadsDir);
 		runCommand("haxe", ["build.hxml", "--jvm", "export/threads.jar"].concat(args));
 		runCommand("java", ["-jar", "export/threads.jar"]);

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

@@ -37,9 +37,6 @@ class Macro {
 			case _: // TODO
 		}
 
-		changeDirectory(eventLoopDir);
-		runCommand("haxe", ["build.hxml"].concat(args).concat(["--interp"]));
-
 		changeDirectory(threadsDir);
 		runCommand("haxe", ["build.hxml", "--interp"]);
 	}

+ 1 - 5
tests/runci/targets/Neko.hx

@@ -13,12 +13,8 @@ class Neko {
 		runCommand("haxe", ["compile-neko.hxml"].concat(args));
 		runCommand("neko", ["bin/neko/sys.n"]);
 
-		changeDirectory(eventLoopDir);
-		runCommand("haxe", ["build.hxml", "--neko", "bin/test.n"]);
-		runCommand("neko", ["bin/test.n"]);
-
 		changeDirectory(threadsDir);
-		runCommand("haxe", ["build.hxml", "-neko", "export/threads.n"]);
+		runCommand("haxe", ["build.hxml", "--neko", "export/threads.n"]);
 		runCommand("neko", ["export/threads.n"]);
 	}
 }

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

@@ -80,14 +80,10 @@ class Python {
 			runCommand(py, ["test.py"]);
 		}
 
-		changeDirectory(eventLoopDir);
-		runCommand("haxe", ["build.hxml", "--python", "bin/test.py"]);
-		for (py in pys) {
-			runCommand(py, ["bin/test.py"]);
-		}
-
 		changeDirectory(threadsDir);
 		runCommand("haxe", ["build.hxml", "--python", "export/threads.py"].concat(args));
-		runCommand("python3", ["export/threads.py"]);
+		for (py in pys) {
+			runCommand(py, ["export/threads.py"]);
+		}
 	}
 }

+ 0 - 0
tests/eventLoop/src/cases/TestEvents.hx → tests/threads/src/cases/TestEvents.hx


+ 0 - 0
tests/eventLoop/src/cases/TestMainLoop.hx → tests/threads/src/cases/TestMainLoop.hx


+ 0 - 0
tests/eventLoop/src/cases/TestTimer.hx → tests/threads/src/cases/TestTimer.hx