Browse Source

remove C# from tests

Simon Krajewski 2 years ago
parent
commit
95b14cc7a2

+ 4 - 4
.github/workflows/main.yml

@@ -351,7 +351,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [macro, js, hl, cpp, 'java,jvm', cs, php, python, lua, flash, neko]
+        target: [macro, js, hl, cpp, 'java,jvm', php, python, lua, flash, neko]
         include:
           - target: hl
             APT_PACKAGES: cmake ninja-build libturbojpeg-dev
@@ -676,7 +676,7 @@ jobs:
       fail-fast: false
       matrix:
         # TODO enable lua after https://github.com/HaxeFoundation/haxe/issues/10919
-        target: [macro, js, hl, cpp, 'java,jvm', cs, php, python, flash, neko]
+        target: [macro, js, hl, cpp, 'java,jvm', php, python, flash, neko]
     steps:
       - uses: actions/checkout@main
         with:
@@ -768,7 +768,7 @@ jobs:
       matrix:
         # TODO jvm: https://github.com/HaxeFoundation/haxe/issues/8601
         # TODO enable lua after https://github.com/HaxeFoundation/haxe/issues/10919
-        target: [macro, js, hl, cpp, java, cs, php, python, flash, neko]
+        target: [macro, js, hl, cpp, java, php, python, flash, neko]
     steps:
       - uses: actions/checkout@main
         with:
@@ -857,7 +857,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [macro, js, hl, cpp, 'java,jvm', cs, php, python, flash, neko]
+        target: [macro, js, hl, cpp, 'java,jvm', php, python, flash, neko]
         include:
           - target: hl
             BREW_PACKAGES: ninja

+ 0 - 2
tests/RunCi.hx

@@ -76,8 +76,6 @@ class RunCi {
 						runci.targets.Java.run(args);
 					case Jvm:
 						runci.targets.Jvm.run(args);
-					case Cs:
-						runci.targets.Cs.run(args);
 					case Flash:
 						runci.targets.Flash.run(args);
 					case Hl:

+ 0 - 1
tests/misc/projects/Issue10871/Compiler/compile1.hxml.stdout

@@ -14,5 +14,4 @@ Main.hx:26: js is forbidden
 Main.hx:26: java is forbidden
 Main.hx:26: hl is forbidden
 Main.hx:26: flash is forbidden
-Main.hx:26: cs is forbidden
 Main.hx:26: cpp is forbidden

+ 0 - 1
tests/misc/projects/Issue10871/Compiler/compile2.hxml.stdout

@@ -15,5 +15,4 @@ Main.hx:26: java is forbidden
 Main.hx:26: hl is forbidden
 Main.hx:26: flash is forbidden
 Main.hx:26: eval is forbidden
-Main.hx:26: cs is forbidden
 Main.hx:26: cpp is forbidden

+ 1 - 2
tests/misc/projects/Issue10871/Compiler/compile3.hxml.stdout

@@ -14,5 +14,4 @@ Main.hx:26: js is forbidden
 Main.hx:26: java is forbidden
 Main.hx:26: hl is forbidden
 Main.hx:26: flash is forbidden
-Main.hx:26: eval is forbidden
-Main.hx:26: cs is forbidden
+Main.hx:26: eval is forbidden

+ 0 - 1
tests/runci/TestTarget.hx

@@ -11,7 +11,6 @@ enum abstract TestTarget(String) from String {
 	var Flash = "flash";
 	var Java = "java";
 	var Jvm = "jvm";
-	var Cs = "cs";
 	var Python = "python";
 	var Hl = "hl";
 }

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

@@ -1,84 +0,0 @@
-package runci.targets;
-
-import sys.FileSystem;
-import runci.System.*;
-import runci.Config.*;
-
-class Cs {
-	static final miscCsDir = getMiscSubDir('cs');
-
-	static public function getCsDependencies() {
-		switch (systemName) {
-			case "Linux":
-				if (!isCi() && commandSucceed("mono", ["--version"]))
-					infoMsg('mono has already been installed.');
-				else
-					Linux.requireAptPackages(["mono-devel", "mono-mcs"]);
-				runCommand("mono", ["--version"]);
-			case "Mac":
-				if (commandSucceed("mono", ["--version"]))
-					infoMsg('mono has already been installed.');
-				else
-					runNetworkCommand("brew", ["install", "mono"]);
-				runCommand("mono", ["--version"]);
-			case "Windows":
-				//pass
-		}
-
-		haxelibInstallGit("HaxeFoundation", "hxcs", true);
-	}
-
-	static public function runCs(exe:String, ?args:Array<String>):Void {
-		if (args == null) args = [];
-		exe = FileSystem.fullPath(exe);
-		switch (systemName) {
-			case "Linux" | "Mac":
-				runCommand("mono", [exe].concat(args));
-			case "Windows":
-				runCommand(exe, args);
-		}
-	}
-
-	static public function run(args:Array<String>) {
-		getCsDependencies();
-
-		for (fastcast in      [[], ["-D", "fast_cast"]])
-		for (noroot in        [[], ["-D", "no_root"]])
-		for (erasegenerics in [[], ["-D", "erase_generics"]])
-		{
-			final extras = fastcast.concat(erasegenerics).concat(noroot);
-			runCommand("haxe", ['compile-cs.hxml'].concat(extras).concat(args));
-			runCs("bin/cs/bin/TestMain-Debug.exe");
-
-			runCommand("haxe", ['compile-cs-unsafe.hxml'].concat(extras).concat(args));
-			runCs("bin/cs_unsafe/bin/TestMain-Debug.exe");
-		}
-
-		runCommand("haxe", ['compile-cs.hxml','-dce','no'].concat(args));
-		runCs("bin/cs/bin/TestMain-Debug.exe");
-
-		changeDirectory(sysDir);
-		runCommand("haxe", ["compile-cs.hxml",'-D','fast_cast'].concat(args));
-		final exe = FileSystem.fullPath("bin/cs/bin/Main-Debug.exe");
-		switch (systemName) {
-			case "Windows":
-				runSysTest(exe);
-			case _:
-				runSysTest("mono", [exe]);
-		}
-
-		changeDirectory(threadsDir);
-		runCommand("haxe", ["build.hxml", "-cs", "export/cs"]);
-		runCs("export/cs/bin/Main.exe");
-
-		changeDirectory(miscCsDir);
-		runCommand("haxe", ["run.hxml"]);
-
-		changeDirectory(getMiscSubDir("cs", "csTwoLibs"));
-		for (i in 1...5)
-		{
-			runCommand("haxe", ['compile-$i.hxml','-D','fast_cast']);
-			runCs("bin/main/bin/Main.exe");
-		}
-	}
-}