skip_all if WinXP as test hangs there

ingydotnet · Dec 24, 2014 · 256e470 · 256e470
1 parent b227148
commit 256e470
Showing 1 changed file with 15 additions and 22 deletions.
diff --git a/test/26fork.t b/test/26fork.t
@@ -5,33 +5,26 @@ use Test::More;
 use Config;
 use Inline Config => DIRECTORY => $TestInlineSetup::DIR;
 
-if($^O =~ /MSWin32/i && $Config{useithreads} ne 'define') {
-  plan skip_all => 'fork() not implemented';
-  exit 0;
+if($^O =~ /MSWin32/i) {
+  plan skip_all => 'fork() not implemented' if $Config{useithreads} ne 'define';
+  plan skip_all => 'Hangs on WinXP'
+    if eval { require Win32; Win32::GetOSName() =~ /^WinXP/ };
 }
 
-    my $pid = fork;
-    eval { Inline->bind(C => 'int add(int x, int y) { return x + y; }'); };
-    exit 0 unless $pid;
+my $pid = fork;
+eval { Inline->bind(C => 'int add(int x, int y) { return x + y; }'); };
+exit 0 unless $pid;
 
-    wait;
-    is($?, 0, 'child exited status 0');
+wait;
+is($?, 0, 'child exited status 0');
 
-if($^O =~ /MSWin32/i){
-  TODO: {
-    local $TODO = "Generally fails on MS Windows";
-    is($@, '', 'bind was successful');
-    my $x = eval { add(7,3) };
-    is ($@, '', 'bound func no die()');
-    is($x, 10, 'bound func gave right result');
-  }
-}
-
-else {
-  is($@, '', 'bind was successful');
+TODO: {
+  local $TODO;
+  $TODO = "Generally fails on MS Windows" if $^O =~ /MSWin32/i;
+  is $@, '', 'bind was successful';
   my $x = eval { add(7,3) };
-  is ($@, '', 'bound func no die()');
-  is($x, 10, 'bound func gave right result');
+  is $@, '', 'bound func no die()';
+  is $x, 10, 'bound func gave right result';
 }
 
 done_testing;