SYN SYN

[p5sagit/p5-mst-13.2.git] / t / op / magic.t

diff --git a/t/op/magic.t b/t/op/magic.t
index fe55521..e2acb1f 100755 (executable)
--- a/t/op/magic.t
+++ b/t/op/magic.t
@@ -1,13 +1,14 @@
 #!./perl
 
 BEGIN {
-    $^W = 1;
     $| = 1;
     chdir 't' if -d 't';
-    unshift @INC, '../lib';
+    @INC = '../lib';
     $SIG{__WARN__} = sub { die "Dying on warning: ", @_ };
 }
 
+use warnings;
+
 sub ok {
     my ($n, $result, $info) = @_;
     if ($result) {
@@ -23,7 +24,7 @@ $Is_MSWin32 = $^O eq 'MSWin32';
 $Is_VMS     = $^O eq 'VMS';
 $Is_Dos   = $^O eq 'dos';
 $Is_os2   = $^O eq 'os2';
-$Is_Cygwin   = $^O =~ /cygwin/;
+$Is_Cygwin   = $^O eq 'cygwin';
 $PERL = ($Is_MSWin32 ? '.\perl' : './perl');
 
 print "1..35\n";
@@ -194,10 +195,10 @@ else {
        ok 29, ($Is_MSWin32 ? (`cmd /x /c set foo 2>NUL` eq "")
                                : (`echo \$foo` eq "\n") );
 
-       $ENV{NoNeSuCh} = "foo";
+       $ENV{__NoNeSuCh} = "foo";
        $0 = "bar";
-       ok 30, ($Is_MSWin32 ? (`cmd /x /c set NoNeSuCh` eq "NoNeSuCh=foo\n")
-                                               : (`echo \$NoNeSuCh` eq "foo\n") );
+       ok 30, ($Is_MSWin32 ? (`cmd /x /c set __NoNeSuCh` eq "__NoNeSuCh=foo\n")
+                           : (`echo \$__NoNeSuCh` eq "foo\n") );
 }
 
 {