Integrate with Sarathy.

p4raw-id: //depot/cfgperl@4913

3 files changed, 8 insertions, 5 deletions

diff --git a/t/op/attrs.t b/t/op/attrs.t
index e89c2cb816..615e4d3343 100644
--- a/t/op/attrs.t
+++ b/t/op/attrs.t
@@ -63,12 +63,12 @@ mytest;
 BEGIN {++$ntests}
 
 my $anon1;
-eval '$anon1 = sub ($) : locked,,method { $_[0]++ }';
+eval '$anon1 = sub ($) : locked:method { $_[0]++ }';
 mytest;
 BEGIN {++$ntests}
 
 my $anon2;
-eval '$anon2 = sub : locked , method { $_[0]++ }';
+eval '$anon2 = sub : locked : method { $_[0]++ }';
 mytest;
 BEGIN {++$ntests}
 
diff --git a/t/op/fork.t b/t/op/fork.t
index b743a4589f..11efa79d17 100755
--- a/t/op/fork.t
+++ b/t/op/fork.t
@@ -6,7 +6,10 @@ BEGIN {
     chdir 't' if -d 't';
     unshift @INC, '../lib';
     require Config; import Config;
-    unless ($Config{'d_fork'} || ($^O eq 'MSWin32' && $Config{'useithreads'})) {
+    unless ($Config{'d_fork'}
+	    or ($^O eq 'MSWin32' and $Config{useithreads}
+		and $Config{ccflags} =~ /-DPERL_IMPLICIT_SYS/))
+    {
 	print "1..0 # Skip: no fork\n";
 	exit 0;
     }
diff --git a/t/op/misc.t b/t/op/misc.t
index 9f8c7dedab..6ffc04cbcf 100755
--- a/t/op/misc.t
+++ b/t/op/misc.t
@@ -357,11 +357,11 @@ BEGIN { @ARGV = qw(a b c d e) }
 BEGIN { print "argv <@ARGV>\nbegin <",shift,">\n" }
 END { print "end <",shift,">\nargv <@ARGV>\n" }
 INIT { print "init <",shift,">\n" }
-STOP { print "stop <",shift,">\n" }
+CHECK { print "check <",shift,">\n" }
 EXPECT
 argv <a b c d e>
 begin <a>
-stop <b>
+check <b>
 init <c>
 end <d>
 argv <e>