From: Andy Dougherty <doughera@lafayette.edu>
Date: Fri, 30 Nov 2001 13:49:48 +0000 (-0500)
Subject: Re: -P and Incredible Disappearing $Config{cppstdin} (was Re: perl@13385)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=68727c7f8d573ba99af069015a1a2546009c0cd3;p=p5sagit%2Fp5-mst-13.2.git

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
--- 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.
     }
 }