Fixes socket tests on Moar on Windows.

Raku · Feb 16, 2014 · 9d9bc71 · 9d9bc71
1 parent f86c971
commit 9d9bc71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/S32-io/IO-Socket-INET.bat b/S32-io/IO-Socket-INET.bat
@@ -8,9 +8,9 @@ SET PORT=%2
 DEL t\spec\S32-io\server-ready-flag 2> NUL
 
 :: Use START to fork the server and set the window title so we can kill it later
-START "P6IOSOCKETtest" /MIN perl6 t\spec\S32-io\IO-Socket-INET.pl %TEST% %PORT% server
+START "P6IOSOCKETtest" /MIN %PERL6_BINARY% t\spec\S32-io\IO-Socket-INET.pl %TEST% %PORT% server
 
-%PERL6_BINARY% t\spec\S32-io\IO-Socket-INET.pl %TEST% %PORT% client
+CALL %PERL6_BINARY% t\spec\S32-io\IO-Socket-INET.pl %TEST% %PORT% client
 
 :: Clean up any stray processes
-TASKKILL /FI "WINDOWTITLE eq P6IOSOCKETtest" > NUL
+TASKKILL /F /T /FI "WINDOWTITLE eq P6IOSOCKETtest*" > NUL
diff --git a/S32-io/IO-Socket-INET.t b/S32-io/IO-Socket-INET.t
@@ -70,7 +70,9 @@ if $*OS eq any <linux Linux darwin solaris MSWin32>, 'Mac OS X' { # please add m
 
     my $is-win;
     $is-win = True if $*OS eq 'MSWin32';
-    my $runner = "PERL6_BINARY={$*EXECUTABLE_NAME.path.absolute}";
+    my $runner = $is-win
+        ?? "SET PERL6_BINARY={$*EXECUTABLE_NAME.path.absolute} &&"
+        !! "PERL6_BINARY={$*EXECUTABLE_NAME.path.absolute}";
 
     # test 2 does echo protocol - Internet RFC 862
     if $is-win {