X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fcharnames.t;h=97663a7d1e4c7f823f911ee024808101bf857a2f;hb=13ef5feb3a8e2368992adc7df8455949512b60b3;hp=b2c1636789455a2a86ae6c23bd692940aff4eb0f;hpb=51cf30b653436b0bbc2a8b902381f06f5842ab04;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/charnames.t b/lib/charnames.t
index b2c1636..97663a7 100644
--- a/lib/charnames.t
+++ b/lib/charnames.t
@@ -6,6 +6,7 @@ BEGIN {
     unless(grep /blib/, @INC) {
 	chdir 't' if -d 't';
 	@INC = '../lib';
+	require './test.pl';
     }
     $SIG{__WARN__} = sub { push @WARN, @_ };
 }
@@ -292,11 +293,9 @@ for (@prgs) {
 	print $ali $fil;
 	close $ali or die "Could not close $alifile: $!";
 	}
-    my $res =
-	$^O eq "MSWin32" ? `.\\perl -I../lib $switch $tmpfile 2>&1` :
-	$^O eq "NetWare" ? `perl    -I../lib $switch $tmpfile 2>&1` :
-	$^O eq "MacOS"   ? `$^X     -I::lib -MMac::err=unix $switch $tmpfile` :
-			   `./perl -I. -I../lib $switch $tmpfile 2>&1`;
+    my $res = runperl( switches => $switch, 
+                       progfile => $tmpfile,
+                       stderr => 1 );
     my $status = $?;
     $res =~ s/[\r\n]+$//;
     $res =~ s/tmp\d+/-/g;			# fake $prog from STDIN