From: Nikola Knezevic Date: Wed, 20 Mar 2002 00:39:16 +0000 (+0100) Subject: magic.t tweak X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8efe09f740803d8bedfed050dff188de3d1113fb;p=p5sagit%2Fp5-mst-13.2.git magic.t tweak Message-ID: <14415673404.20020320003916@tesla.rcub.bg.ac.yu> p4raw-id: //depot/perl@15359 --- diff --git a/t/op/magic.t b/t/op/magic.t index ede0b8b..139f723 100755 --- a/t/op/magic.t +++ b/t/op/magic.t @@ -55,7 +55,7 @@ $PERL = ($Is_NetWare ? 'perl' : eval '$ENV{"FOO"} = "hi there";'; # check that ENV is inited inside eval # cmd.exe will echo 'variable=value' but 4nt will echo just the value # -- Nikola Knezevic -if ($Is_MSWin32) { ok `set FOO` =~ /^(FOO=)?hi there$/; } +if ($Is_MSWin32) { ok `set FOO` =~ /^(?:FOO=)?hi there$/; } elsif ($Is_MacOS) { ok "1 # skipped", 1; } elsif ($Is_VMS) { ok `write sys\$output f\$trnlnm("FOO")` eq "hi there\n"; } else { ok `echo \$FOO` eq "hi there\n"; } @@ -246,7 +246,7 @@ else { $0 = "bar"; # cmd.exe will echo 'variable=value' but 4nt will echo just the value # -- Nikola Knezevic - ok ($Is_MSWin32 ? (`set __NoNeSuCh` =~ /^(__NoNeSuCh=)?foo$/) + ok ($Is_MSWin32 ? (`set __NoNeSuCh` =~ /^(?:__NoNeSuCh=)?foo$/) : (`echo \$__NoNeSuCh` eq "foo\n") ); }