X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/8606a93d9e071a00b39c94e9658cc597d57888ea..a817e89d04f0dee7285d1e26ba27439611ce97f9:/t/lib/common.pl

diff --git a/t/lib/common.pl b/t/lib/common.pl
index 5a26fa0..367c676 100644
--- a/t/lib/common.pl
+++ b/t/lib/common.pl
@@ -1,15 +1,16 @@
-# This code is used by lib/charnames.t, lib/feature.t, lib/subs.t,
-# lib/strict.t and lib/warnings.t
+# This code is used by lib/charnames.t, lib/croak.t, lib/feature.t,
+# lib/subs.t, lib/strict.t and lib/warnings.t
 #
 # On input, $::local_tests is the number of tests in the caller; or
 # 'no_plan' if unknown, in which case it is the caller's responsibility
 # to call cur_test() to find out how many this executed
 
 BEGIN {
-    require './test.pl';
+    require './test.pl'; require './charset_tools.pl';
 }
 
 use Config;
+use File::Path;
 use File::Spec::Functions qw(catfile curdir rel2abs);
 
 use strict;
@@ -20,204 +21,39 @@ my ($pragma_name) = $file =~ /([A-Za-z_0-9]+)\.t$/
 
 $| = 1;
 
-my @prgs = () ;
-my @w_files = () ;
+my @w_files;
 
-if (@ARGV)
-  { print "ARGV = [@ARGV]\n" ;
-      @w_files = map { s#^#./lib/$pragma_name/#; $_ } @ARGV
-  }
-else
-  { @w_files = sort glob(catfile(curdir(), "lib", $pragma_name, "*")) }
-
-my $files = 0;
-foreach my $file (@w_files) {
-
-    next if $file =~ /(~|\.orig|,v)$/;
-    next if $file =~ /perlio$/ && !(find PerlIO::Layer 'perlio');
-    next if -d $file;
-
-    open my $fh, '<', $file or die "Cannot open $file: $!\n" ;
-    my $line = 0;
-    while (<$fh>) {
-        $line++;
-	last if /^__END__/ ;
-    }
-
-    {
-        local $/ = undef;
-        $files++;
-        @prgs = (@prgs, $file, split "\n########\n", <$fh>) ;
-    }
-    close $fh;
+if (@ARGV) {
+    print "ARGV = [@ARGV]\n";
+    @w_files = map { "./lib/$pragma_name/$_" } @ARGV;
+} else {
+    @w_files = sort glob catfile(curdir(), "lib", $pragma_name, "*");
 }
 
+my ($tests, @prgs) = setup_multiple_progs(@w_files);
+
 $^X = rel2abs($^X);
+@INC = map { rel2abs($_) } @INC;
 my $tempdir = tempfile;
 
 mkdir $tempdir, 0700 or die "Can't mkdir '$tempdir': $!";
 chdir $tempdir or die die "Can't chdir '$tempdir': $!";
-unshift @INC, '../../lib';
 my $cleanup = 1;
 
 END {
     if ($cleanup) {
-	require File::Path;
 	chdir '..' or die "Couldn't chdir .. for cleanup: $!";
-	File::Path::rmtree($tempdir);
+	rmtree($tempdir);
     }
 }
 
-local $/ = undef;
-
-my $tests = $::local_tests || 0;
-$tests = scalar(@prgs)-$files + $tests if $tests !~ /\D/;
-plan $tests;    # If input is 'no_plan', pass it on unchanged
-
-my $tmpfile = tempfile();
-
-for (@prgs){
-    unless (/\n/)
-     {
-      print "# From $_\n";
-      next;
-     }
-    my $switch = "";
-    my @temps = () ;
-    my @temp_path = () ;
-    if (s/^\s*-\w+//){
-        $switch = $&;
-    }
-    my($prog,$expected) = split(/\nEXPECT(?:\n|$)/, $_, 2);
-
-    my %reason;
-    foreach my $what (qw(skip todo)) {
-	$prog =~ s/^#\s*\U$what\E\s*(.*)\n//m and $reason{$what} = $1;
-	# If the SKIP reason starts ? then it's taken as a code snippet to
-	# evaluate. This provides the flexibility to have conditional SKIPs
-	if ($reason{$what} && $reason{$what} =~ s/^\?//) {
-	    my $temp = eval $reason{$what};
-	    if ($@) {
-		die "# In \U$what\E code reason:\n# $reason{$what}\n$@";
-	    }
-	    $reason{$what} = $temp;
-	}
-    }
-
-    if ( $prog =~ /--FILE--/) {
-        my(@files) = split(/\n--FILE--\s*([^\s\n]*)\s*\n/, $prog) ;
-	shift @files ;
-	die "Internal error: test $_ didn't split into pairs, got " .
-		scalar(@files) . "[" . join("%%%%", @files) ."]\n"
-	    if @files % 2 ;
-	while (@files > 2) {
-	    my $filename = shift @files ;
-	    my $code = shift @files ;
-    	    push @temps, $filename ;
-    	    if ($filename =~ m#(.*)/# && $filename !~ m#^\.\./#) {
-		require File::Path;
-                File::Path::mkpath($1);
-                push(@temp_path, $1);
-	    }
-	    open my $fh, '>', $filename or die "Cannot open $filename: $!\n" ;
-	    print $fh $code;
-	    close $fh or die "Cannot close $filename: $!\n";
-	}
-	shift @files ;
-	$prog = shift @files ;
-    }
-
-    open my $fh, '>', $tmpfile or die "Cannot open >$tmpfile: $!";
-    print $fh q{
-        BEGIN {
-            open STDERR, '>&', STDOUT
-              or die "Can't dup STDOUT->STDERR: $!;";
-        }
-    };
-    print $fh "\n#line 1\n";  # So the line numbers don't get messed up.
-    print $fh $prog,"\n";
-    close $fh or die "Cannot close $tmpfile: $!";
-    my $results = runperl( switches => ["-I../../lib", $switch], nolib => 1,
-			   stderr => 1, progfile => $tmpfile );
-    my $status = $?;
-    $results =~ s/\n+$//;
-    # allow expected output to be written as if $prog is on STDIN
-    $results =~ s/$::tempfile_regexp/-/g;
-    if ($^O eq 'VMS') {
-        # some tests will trigger VMS messages that won't be expected
-        $results =~ s/\n?%[A-Z]+-[SIWEF]-[A-Z]+,.*//;
-
-        # pipes double these sometimes
-        $results =~ s/\n\n/\n/g;
-    }
-# bison says 'parse error' instead of 'syntax error',
-# various yaccs may or may not capitalize 'syntax'.
-    $results =~ s/^(syntax|parse) error/syntax error/mig;
-    # allow all tests to run when there are leaks
-    $results =~ s/Scalars leaked: \d+\n//g;
-
-    $expected =~ s/\n+$//;
-    my $prefix = ($results =~ s#^PREFIX(\n|$)##) ;
-    # any special options? (OPTIONS foo bar zap)
-    my $option_regex = 0;
-    my $option_random = 0;
-    if ($expected =~ s/^OPTIONS? (.+)\n//) {
-	foreach my $option (split(' ', $1)) {
-	    if ($option eq 'regex') { # allow regular expressions
-		$option_regex = 1;
-	    }
-	    elsif ($option eq 'random') { # all lines match, but in any order
-		$option_random = 1;
-	    }
-	    else {
-		die "$0: Unknown OPTION '$option'\n";
-	    }
-	}
-    }
-    die "$0: can't have OPTION regex and random\n"
-        if $option_regex + $option_random > 1;
-    my $ok = 0;
-    if ($results =~ s/^SKIPPED\n//) {
-	print "$results\n" ;
-	$ok = 1;
-    }
-    elsif ($option_random) {
-	my @got = sort split "\n", $results;
-	my @expected = sort split "\n", $expected;
-	
-	$ok = "@got" eq "@expected";
-    }
-    elsif ($option_regex) {
-	$ok = $results =~ /^$expected/;
-    }
-    elsif ($prefix) {
-	$ok = $results =~ /^\Q$expected/;
-    }
-    else {
-	$ok = $results eq $expected;
-    }
- 
-    local $::TODO = $reason{todo};
-
-    unless ($ok) {
-	my $err_line = "PROG: $switch\n$prog\n" .
-		       "EXPECTED:\n$expected\n" .
-		       "GOT:\n$results\n";
-	if ($::TODO) {
-	    $err_line =~ s/^/# /mg;
-	    print $err_line;  # Harness can't filter it out from STDERR.
-	}
-	else {
-	    print STDERR $err_line;
-	}
-    }
-
-    ok($ok);
-
-    foreach (@temps)
-	{ unlink $_ if $_ }
-    foreach (@temp_path)
-	{ File::Path::rmtree $_ if -d $_ }
+if ($::local_tests && $::local_tests =~ /\D/) {
+    # If input is 'no_plan', pass it on unchanged
+    plan $::local_tests;
+} else {
+    plan $tests + ($::local_tests || 0);
 }
 
+run_multiple_progs('../..', @prgs);
+
 1;