diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2002-07-10 23:20:10 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2002-07-10 23:20:10 +0000 |
| commit | 22fc9b384803facb2fae9f3e00ef07d7af835e6b (patch) | |
| tree | b4948200f8bc136c30cad2a56a16db1cd0ff3efe /t | |
| parent | f792fa1bf9e775e687dc2fc467422b5e26ad7713 (diff) | |
| download | perl-22fc9b384803facb2fae9f3e00ef07d7af835e6b.tar.gz | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/op/magic.t | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/t/op/magic.t b/t/op/magic.t index c21b12a86d..436e253ee2 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 |