oct and hex in glorious 64 bit (with less bugs) (was Re: hex and oct again (was Re...

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

diff --git a/t/op/magic.t b/t/op/magic.t
index aa568a7..8d9b67b 100755 (executable)
--- a/t/op/magic.t
+++ b/t/op/magic.t
@@ -32,7 +32,9 @@ $PERL = ($Is_MSWin32 ? '.\perl' : ($Is_NetWare ? 'perl' : './perl'));
 print "1..41\n";
 
 eval '$ENV{"FOO"} = "hi there";';      # check that ENV is inited inside eval
-if ($Is_MSWin32) { ok 1, `cmd /x /c set FOO` eq "FOO=hi there\n"; }
+# cmd.exe will echo 'variable=value' but 4nt will echo just the value
+# -- Nikola Knezevic
+if ($Is_MSWin32) { ok 1, `set FOO` =~ /^(FOO=)?hi there$/; }
 else             { ok 1, `echo \$FOO` eq "hi there\n"; }
 
 unlink 'ajslkdfpqjsjfk';
@@ -196,12 +198,14 @@ else {
        %ENV = ();
        $ENV{PATH} = $PATH;
        $ENV{PERL_DESTRUCT_LEVEL} = $PDL || 0;
-       ok 29, ($Is_MSWin32 ? (`cmd /x /c set foo 2>NUL` eq "")
+       ok 29, ($Is_MSWin32 ? (`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")
+# cmd.exe will echo 'variable=value' but 4nt will echo just the value
+# -- Nikola Knezevic
+       ok 30, ($Is_MSWin32 ? (`set __NoNeSuCh` =~ /^(__NoNeSuCh=)?foo$/)
                            : (`echo \$__NoNeSuCh` eq "foo\n") );
 }