1 files changed, 11 insertions, 45 deletions
diff --git a/t/comp/cpp.t b/t/comp/cpp.t
index 942f77f3a1..880aed836e 100755
--- a/t/comp/cpp.t
+++ b/t/comp/cpp.t
@@ -1,51 +1,17 @@
-#!./perl -P
+#!./perl
 
 # $RCSfile: cpp.t,v $$Revision: 4.1 $$Date: 92/08/07 18:27:18 $
 
-open(CONFIG,"../config.sh") || die;
-while (<CONFIG>) {
-    if (/^cppstdin/) {
-	if (/^cppstdin='(.*cppstdin)'/ && ! -e $1) {
-	    print "1..0\n";
-	    exit; 		# Cannot test till after install, alas.
-	}
-	last;
-    }
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
 }
-close CONFIG;
 
-print "1..3\n";
-
-#this is a comment
-#define MESS "ok 1\n"
-print MESS;
-
-#If you capitalize, it's a comment.
-#ifdef MESS
-	print "ok 2\n";
-#else
-	print "not ok 2\n";
-#endif
-
-open(TRY,">Comp.cpp.tmp") || die "Can't open temp perl file.";
-
-($prog = <<'END') =~ s/X//g;
-X$ok = "not ok 3\n";
-X#include "Comp.cpp.inc"
-X#ifdef OK
-X$ok = OK;
-X#endif
-Xprint $ok;
-END
-print TRY $prog;
-close TRY;
-
-open(TRY,">Comp.cpp.inc") || (die "Can't open temp include file.");
-print TRY '#define OK "ok 3\n"' . "\n";
-close TRY;
+use Config;
+if ( ($Config{'cppstdin'} =~ /\bcppstdin\b/) and
+     ( ! -x $Config{'scriptdir'} . "/cppstdin") ) {
+    print "1..0\n";
+    exit; 		# Cannot test till after install, alas.
+}
 
-$pwd=`pwd`;
-$pwd =~ s/\n//;
-$x = `./perl -P Comp.cpp.tmp`;
-print $x;
-unlink "Comp.cpp.tmp", "Comp.cpp.inc";
+system "./perl -P comp/cpp.aux"