Re: -P and Incredible Disappearing $Config{cppstdin} (was Re: perl@13385)

Message-ID: <Pine.SOL.4.10.10111301304220.13302-100000@maxwell.phys.lafayette.edu>

Simplify the test skippage criterion now that we are
no more dependent on sed.

p4raw-id: //depot/perl@13392

diff --git a/t/comp/cpp.t b/t/comp/cpp.t
index e80ce33..44eeea4 100755 (executable)
--- 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 (file)
--- 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.
     }
 }