From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Wed, 10 Jul 2002 23:20:10 +0000 (+0000)
Subject: Retract #17455, #17427, #17425 on t/op/magic.t (but leave
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=22fc9b384803facb2fae9f3e00ef07d7af835e6b;p=p5sagit%2Fp5-mst-13.2.git

Retract #17455, #17427, #17425 on t/op/magic.t (but leave
in the toke.c change #17425, it is ARG_ZERO_IS_SCRIPT
specific and known to work on the platforms that need it),
on Sarathy's advice.
p4raw-link: @17425 on //depot/perl: 556c1dec75ad51f872cfdfbbd8c86d5def08c80b

p4raw-id: //depot/perl@17473
---

diff --git a/t/op/magic.t b/t/op/magic.t
index c21b12a..436e253 100755
--- a/t/op/magic.t
+++ b/t/op/magic.t
@@ -201,9 +201,6 @@ EOT
     elsif ($Is_VMS) {
       $script = "[]show-shebang";
     }
-    else {
-      $script = "./show-shebang";
-    }
     if ($^O eq 'os390' or $^O eq 'posix-bc' or $^O eq 'vmesa') {  # no shebang
 	$headmaybe = <<EOH ;
     eval 'exec ./perl -S \$0 \${1+"\$\@"}'
@@ -229,19 +226,7 @@ EOF
     s/\.exe//i if $Is_Dos or $Is_os2;
     s{\\}{/}g;
     ok((($Is_MSWin32 || $Is_os2) ? uc($_) eq uc($s1) : $_ eq $s1), " :$_:!=:$s1: after `$perl $script`");
-
-    local $ENV{PATH}= ".";
-    (my $script_name = $script) =~ s/.*(show-shebang)/$1/;
-    $script_name = "[]$script_name" if $Is_VMS;
-    $s1 = "\$^X is $perl, \$0 is $script_name\n" if $Is_MSWin32;
-    $_ = $Is_VMS ? `$^X $script_name` : `$script_name`;
-    s/\.exe//i if $Is_Dos or $Is_Cygwin or $Is_os2;
-    s{\bminiperl\b}{perl}; # so that test doesn't fail with miniperl
-    s{is perl}{is $perl}; # for systems where $^X is only a basename
-    s{\\}{/}g;
-    ok((($Is_MSWin32 || $Is_os2) ? uc($_) eq uc($s1) : $_ eq $s1), " :$_:!=:$s1:");
-
-    unlink($script) || die "unlink($script): $!";
+    ok unlink($script), $!;
 }
 
 # $], $^O, $^T