Integrate mainline

p4raw-id: //depot/perlio@16541

2 files changed, 14 insertions, 3 deletions

diff --git a/t/TEST b/t/TEST
index af9edc8dd8..47560cdc71 100755
--- a/t/TEST
+++ b/t/TEST
@@ -19,6 +19,7 @@ if ($#ARGV >= 0) {
 	push( @argv, $ARGV[$idx] ), next unless $ARGV[$idx] =~ /^-(\S+)$/;
 	$core    = 1 if $1 eq 'core';
 	$verbose = 1 if $1 eq 'v';
+	$torture = 1 if $1 eq 'torture';
 	$with_utf= 1 if $1 eq 'utf8';
         $byte_compile = 1 if $1 eq 'bytecompile';
         $compile = 1 if $1 eq 'compile';
@@ -110,9 +111,11 @@ unless (@ARGV) {
     } else {
         warn "$0: cannot open $mani: $!\n";
     }
-    _find_tests('pod')  unless $core;
-    _find_tests('x2p')  unless $core;
-    _find_tests('japh') unless $core;
+    unless ($core) {
+	_find_tests('pod');  
+	_find_tests('x2p');
+	_find_tests('japh') if $torture;
+    }
 }
 
 # Tests known to cause infinite loops for the perlcc tests.
diff --git a/t/harness b/t/harness
index 1a15ebcca2..fafba45c2a 100644
--- a/t/harness
+++ b/t/harness
@@ -9,11 +9,18 @@ BEGIN {
     $ENV{PERL5LIB} = '../lib';    # so children will see it too
 }
 
+my $torture; # torture testing?
+
 use Test::Harness;
 
 $Test::Harness::switches = "";    # Too much noise otherwise
 $Test::Harness::verbose = shift if @ARGV && $ARGV[0] eq '-v';
 
+if ($ARGV[0] eq '-torture') {
+    shift;
+    $torture = 1;
+}
+
 # Let tests know they're running in the perl core.  Useful for modules
 # which live dual lives on CPAN.
 $ENV{PERL_CORE} = 1;
@@ -57,6 +64,7 @@ if (@ARGV) {
         push @tests, <op/*.t>;
         push @tests, <uni/*.t>;
         push @tests, <lib/*.t>;
+        push @tests, <japh/*.t> if $torture;
 	push @tests, <win32/*.t> if $^O eq 'MSWin32';
 	use File::Spec;
 	my $updir = File::Spec->updir;