From: Charles Lane Date: Thu, 5 Oct 2000 07:46:33 +0000 (-0400) Subject: Eliminate $Is_VMS code from the test. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6b462c4aaffb8b560a6914377c65892b039eb419;p=p5sagit%2Fp5-mst-13.2.git Eliminate $Is_VMS code from the test. Subject: Re: [ID 20001004.005] Not OK: perl v5.7.0 +DEVEL7129 on VMS_AXP V7.1 Message-Id: <001005074528.21621@DUPHY4.Physics.Drexel.Edu> p4raw-id: //depot/perl@7158 --- diff --git a/t/lib/b.t b/t/lib/b.t index aabfc0d..2be4d10 100755 --- a/t/lib/b.t +++ b/t/lib/b.t @@ -55,13 +55,7 @@ ok; my $a; my $Is_VMS = $^O eq 'VMS'; -if ($Is_VMS) { - $^X = "MCR $^X"; - $a = `$^X "-I../lib" "-MO=Deparse" -anle "1"`; -} -else { - $a = `$^X -I../lib -MO=Deparse -anle 1 2>&1`; -} +$a = `$^X "-I../lib" "-MO=Deparse" -anle 1 2>&1`; $a =~ s/-e syntax OK\n//g; $b = <<'EOF'; @@ -79,33 +73,18 @@ print "# [$a]\n\# vs\n# [$b]\nnot " if $a ne $b; ok; #6 -if ($Is_VMS) { - $a = `$^X "-I../lib" "-MO=Debug" -e "1"`; -} -else { - $a = `$^X -I../lib -MO=Debug -e 1 2>&1`; -} +$a = `$^X "-I../lib" "-MO=Debug" -e 1 2>&1`; print "not " unless $a =~ /\bLISTOP\b.*\bOP\b.*\bCOP\b.*\bOP\b/s; ok; #7 -if ($Is_VMS) { - $a = `$^X "-I../lib" "-MO=Terse" -e "1"`; -} -else { - $a = `$^X -I../lib -MO=Terse -e 1 2>&1`; -} +$a = `$^X "-I../lib" "-MO=Terse" -e 1 2>&1`; print "not " unless $a =~ /\bLISTOP\b.*leave.*\bOP\b.*enter.*\bCOP\b.*nextstate.*\bOP\b.*null/s; ok; -if ($Is_VMS) { - $a = `$^X "-I../lib" "-MO=Terse" -ane "s/foo/bar/"`; -} -else { - $a = `$^X -I../lib -MO=Terse -ane "s/foo/bar/" 2>&1`; -} +$a = `$^X "-I../lib" "-MO=Terse" -ane "s/foo/bar/" 2>&1`; $a =~ s/\(0x[^)]+\)//g; $a =~ s/\[[^\]]+\]//g; $a =~ s/-e syntax OK//; @@ -133,12 +112,7 @@ $b =~ s/\s+$//; print "# [$a]\n# vs\n# [$b]\nnot " if $a ne $b; ok; -if ($Is_VMS) { - chomp($a = `$^X "-I../lib" "-MB::Stash" "-Mwarnings" -e "1"`); -} -else { - chomp($a = `$^X -I../lib -MB::Stash -Mwarnings -e1`); -} +chomp($a = `$^X "-I../lib" "-MB::Stash" "-Mwarnings" -e1`); $a = join ',', sort split /,/, $a; $a =~ s/-uWin32,// if $^O eq 'MSWin32'; $a =~ s/-u(Cwd|File|File::Copy|OS2),//g if $^O eq 'os2'; @@ -155,12 +129,7 @@ if ($Config{static_ext} eq ' ') { if ($is_thread) { print "# use5005threads: test $test skipped\n"; } else { - if ($Is_VMS) { - $a = `$^X "-I../lib" "-MO=Showlex" -e "my %one"`; - } - else { - $a = `$^X -I../lib -MO=Showlex -e "my %one" 2>&1`; - } + $a = `$^X "-I../lib" "-MO=Showlex" -e "my %one" 2>&1`; print "# [$a]\nnot " unless $a =~ /sv_undef.*PVNV.*%one.*sv_undef.*HV/s; } ok;