[tests] Avoid cppia args/programPath bug

See: HaxeFoundation/hxcpp#1174
tobil4sk · Jan 16, 2025 · 53f7f98 · 53f7f98
1 parent caf83fa
commit 53f7f98
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/tests/sys/src/TestArguments.hx b/tests/sys/src/TestArguments.hx
@@ -100,7 +100,7 @@ class TestArguments extends utest.Test {
 	#end
 
 	function testArgs() {
-		var args = Sys.args();
+		var args = Sys.args() #if cppia .slice(1) #end;
 		for (i in 0...expectedArgs.length) {
 			Assert.equals(expectedArgs[i], args[i]);
 		}

diff --git a/tests/sys/src/TestSys.hx b/tests/sys/src/TestSys.hx
@@ -107,14 +107,10 @@ class TestSys extends TestCommandBase {
 			Assert.isTrue(StringTools.endsWith(p, "sys.n"));
 		#elseif cpp
 			#if cppia
-				Assert.isTrue(StringTools.endsWith(p, "Main.cppia"));
+				// Assert.isTrue(StringTools.endsWith(p, "Main.cppia"));
+				Assert.isTrue(StringTools.endsWith(p, "Host-debug" + (Sys.systemName() == "Windows" ? ".exe" : "")));
 			#else
-				switch (Sys.systemName()) {
-					case "Windows":
-						Assert.isTrue(StringTools.endsWith(p, "Main-debug.exe"));
-					case _:
-						Assert.isTrue(StringTools.endsWith(p, "Main-debug"));
-				}
+				Assert.isTrue(StringTools.endsWith(p, "Main-debug" + (Sys.systemName() == "Windows" ? ".exe" : "")));
 			#end
 		#elseif jvm
 			Assert.isTrue(StringTools.endsWith(p, "sys.jar"));

diff --git a/tests/sys/src/UtilityProcess.hx b/tests/sys/src/UtilityProcess.hx
@@ -157,7 +157,7 @@ class UtilityProcess {
 	}
 
 	public static function main():Void {
-		var args = Sys.args();
+		var args = Sys.args() #if cppia .slice(1) #end;
 		function sequenceIndex(d:String, mode:String):String
 			return switch UnicodeSequences.valid[Std.parseInt(d)] {
 				case Only(ref): UnicodeSequences.codepointsToString(ref);