[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 f3e6ba3..49caab5 100755 (executable)
--- a/t/op/magic.t
+++ b/t/op/magic.t
@@ -1,7 +1,5 @@
 #!./perl
 
-# $RCSfile: magic.t,v $$Revision: 4.1 $$Date: 92/08/07 18:28:05 $
-
 BEGIN {
     $^W = 1;
     $| = 1;
@@ -21,10 +19,15 @@ sub ok {
     }
 }
 
-print "1..28\n";
+$Is_MSWin32 = $^O eq 'MSWin32';
+$Is_VMS     = $^O eq 'VMS';
+$PERL = ($Is_MSWin32 ? '.\perl' : './perl');
+
+print "1..30\n";
 
 eval '$ENV{"foo"} = "hi there";';      # check that ENV is inited inside eval
-ok 1, `echo \$foo` eq "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';
 $! = 0;
@@ -32,10 +35,14 @@ open(FOO,'ajslkdfpqjsjfk');
 ok 2, $!, $!;
 close FOO; # just mention it, squelch used-only-once
 
-# the next tests are embedded inside system simply because sh spits out
-# a newline onto stderr when a child process kills itself with SIGINT.
-
-system './perl', '-e', <<'END';
+if ($Is_MSWin32) {
+    ok 3,1;
+    ok 4,1;
+}
+else {
+  # the next tests are embedded inside system simply because sh spits out
+  # a newline onto stderr when a child process kills itself with SIGINT.
+  system './perl', '-e', <<'END';
 
     $| = 1;            # command buffering
 
@@ -53,8 +60,10 @@ system './perl', '-e', <<'END';
     }
 
 END
+}
 
-@val1 = @ENV{keys(%ENV)};      # can we slice ENV?
+# can we slice ENV?
+@val1 = @ENV{keys(%ENV)};
 @val2 = values(%ENV);
 ok 5, join(':',@val1) eq join(':',@val2);
 ok 6, @val1 > 1;
@@ -86,9 +95,9 @@ ok 13, (keys %h)[0] eq "foo\034bar", (keys %h)[0];
 }
 
 # $?, $@, $$
-system 'true';
+system qq[$PERL -e "exit(0)"];
 ok 15, $? == 0, $?;
-system 'false';
+system qq[$PERL -e "exit(1)"];
 ok 16, $? != 0, $?;
 
 eval { die "foo\n" };
@@ -97,34 +106,59 @@ ok 17, $@ eq "foo\n", $@;
 ok 18, $$ > 0, $$;
 
 # $^X and $0
-if ($^O eq 'qnx') {
-    chomp($wd = `pwd`);
+if ($Is_MSWin32) {
+    for (19 .. 25) { ok $_, 1 }
 }
 else {
-    $wd = '.';
-}
-$script = "$wd/show-shebang";
-$s1 = $s2 = "\$^X is $wd/perl, \$0 is $script\n";
-if ($^O eq 'os2') {
-    # Started by ksh, which adds suffixes '.exe' and '.' to perl and script
-    $s2 = "\$^X is $wd/perl.exe, \$0 is $script.\n";
-}
-ok 19, open(SCRIPT, ">$script"), $!;
-ok 20, print(SCRIPT <<EOB . <<'EOF'), $!;
+    if ($^O eq 'qnx') {
+       chomp($wd = `pwd`);
+    }
+    else {
+       $wd = '.';
+    }
+    $script = "$wd/show-shebang";
+    $s1 = $s2 = "\$^X is $wd/perl, \$0 is $script\n";
+    if ($^O eq 'os2') {
+       # Started by ksh, which adds suffixes '.exe' and '.' to perl and script
+       $s2 = "\$^X is $wd/perl.exe, \$0 is $script.\n";
+    }
+    ok 19, open(SCRIPT, ">$script"), $!;
+    ok 20, print(SCRIPT <<EOB . <<'EOF'), $!;
 #!$wd/perl
 EOB
 print "\$^X is $^X, \$0 is $0\n";
 EOF
-ok 21, close(SCRIPT), $!;
-ok 22, chmod(0755, $script), $!;
-$_ = `$script`;
-s{is perl}{is $wd/perl}; # for systems where $^X is only a basename
-ok 23, $_ eq $s2, ":$_:!=:$s2:";
-$_ = `$wd/perl $script`;
-ok 24, $_ eq $s1, ":$_:!=:$s1: after `$wd/perl $script`";
-ok 25, unlink($script), $!;
+    ok 21, close(SCRIPT), $!;
+    ok 22, chmod(0755, $script), $!;
+    $_ = `$script`;
+    s{\bminiperl\b}{perl}; # so that test doesn't fail with miniperl
+    s{is perl}{is $wd/perl}; # for systems where $^X is only a basename
+    ok 23, $_ eq $s2, ":$_:!=:$s2:";
+    $_ = `$wd/perl $script`;
+    ok 24, $_ eq $s1, ":$_:!=:$s1: after `$wd/perl $script`";
+    ok 25, unlink($script), $!;
+}
 
 # $], $^O, $^T
 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") );
+}
+