From 68727c7f8d573ba99af069015a1a2546009c0cd3 Mon Sep 17 00:00:00 2001 From: Andy Dougherty Date: Fri, 30 Nov 2001 08:49:48 -0500 Subject: [PATCH] Re: -P and Incredible Disappearing $Config{cppstdin} (was Re: perl@13385) Message-ID: Simplify the test skippage criterion now that we are no more dependent on sed. p4raw-id: //depot/perl@13392 --- t/comp/cpp.t | 5 ++--- t/run/switchPx.t | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/t/comp/cpp.t b/t/comp/cpp.t index e80ce33..44eeea4 100755 --- a/t/comp/cpp.t +++ b/t/comp/cpp.t @@ -8,9 +8,8 @@ BEGIN { } use Config; -if ( $^O eq 'MSWin32' or $^O eq 'MacOS' or - ($Config{'cppstdin'} =~ /\bcppstdin\b/) and - ( ! -x $Config{'binexp'} . "/cppstdin") ) { +if ( ($Config{'cppstdin'} =~ /\bcppstdin\b/) && + ! -x $Config{'binexp'} . "/cppstdin" ) { print "1..0 # Skip: \$Config{cppstdin} unavailable\n"; exit; # Cannot test till after install, alas. } diff --git a/t/run/switchPx.t b/t/run/switchPx.t index 6550802..009fc49 100644 --- a/t/run/switchPx.t +++ b/t/run/switchPx.t @@ -7,11 +7,10 @@ BEGIN { @INC = '../lib'; use Config; - if ( $^O eq 'MSWin32' or $^O eq 'MacOS' or - ($Config{'cppstdin'} =~ /\bcppstdin\b/) and - ( ! -x $Config{'binexp'} . "/cppstdin") ) { + if ( ($Config{'cppstdin'} =~ /\bcppstdin\b/) && + ! -x $Config{'binexp'} . "/cppstdin" ) { print "1..0 # Skip: \$Config{cppstdin} unavailable\n"; - exit; # Cannot test till after install, alas. + exit; # Cannot test till after install, alas. } } -- 2.7.4