[differences between cumulative patch application and perl5.004_01]

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

diff --git a/t/op/magic.t b/t/op/magic.t
index fa19716..49caab5 100755 (executable)
--- a/t/op/magic.t
+++ b/t/op/magic.t
@@ -19,13 +19,14 @@ sub ok {
     }
 }
 
-$Is_MSWin32 = ($^O eq 'MSWin32');
+$Is_MSWin32 = $^O eq 'MSWin32';
+$Is_VMS     = $^O eq 'VMS';
 $PERL = ($Is_MSWin32 ? '.\perl' : './perl');
 
-print "1..28\n";
+print "1..30\n";
 
 eval '$ENV{"foo"} = "hi there";';      # check that ENV is inited inside eval
-if ($Is_MSWin32) { ok 1, `set foo` eq "foo=hi there\n"; }
+if ($Is_MSWin32) { ok 1, `cmd /x /c set foo` eq "foo=hi there\n"; }
 else             { ok 1, `echo \$foo` eq "hi there\n"; }
 
 unlink 'ajslkdfpqjsjfk';
@@ -94,9 +95,9 @@ ok 13, (keys %h)[0] eq "foo\034bar", (keys %h)[0];
 }
 
 # $?, $@, $$
-system "$PERL -e 'exit(0)'";
+system qq[$PERL -e "exit(0)"];
 ok 15, $? == 0, $?;
-system "$PERL -e 'exit(1)'";
+system qq[$PERL -e "exit(1)"];
 ok 16, $? != 0, $?;
 
 eval { die "foo\n" };
@@ -109,7 +110,7 @@ if ($Is_MSWin32) {
     for (19 .. 25) { ok $_, 1 }
 }
 else {
-    if ($^O eq 'qnx' || $^O eq 'amigaos') {
+    if ($^O eq 'qnx') {
        chomp($wd = `pwd`);
     }
     else {
@@ -142,3 +143,22 @@ EOF
 ok 26, $] >= 5.00319, $];
 ok 27, $^O;
 ok 28, $^T > 850000000, $^T;
+
+if ($Is_VMS) {
+       ok 29, 1;
+       ok 30, 1;
+}
+else {
+       $PATH = $ENV{PATH};
+       $ENV{foo} = "bar";
+       %ENV = ();
+       $ENV{PATH} = $PATH;
+       ok 29, ($Is_MSWin32 ? (`cmd /x /c set foo 2>NUL` eq "")
+                               : (`echo \$foo` eq "\n") );
+
+       $ENV{NoNeSuCh} = "foo";
+       $0 = "bar";
+       ok 30, ($Is_MSWin32 ? (`cmd /x /c set NoNeSuCh` eq "NoNeSuCh=foo\n")
+                                               : (`echo \$NoNeSuCh` eq "foo\n") );
+}
+