Integrate Mainline

p4raw-id: //depot/perlio@12731

2 files changed, 19 insertions, 20 deletions

diff --git a/t/TEST b/t/TEST
index e2a5a97b4a..d55874981f 100755
--- a/t/TEST
+++ b/t/TEST
@@ -305,39 +305,40 @@ EOT
 	else {
 	    warn "Failed $bad test scripts out of $files, $pct% okay.\n";
 	}
-	warn <<'SHRDLU';
+	warn <<'SHRDLU_1';
    ### Since not all tests were successful, you may want to run some of
    ### them individually and examine any diagnostic messages they produce.
    ### See the INSTALL document's section on "make test".
-SHRDLU
-	warn <<'SHRDLU' if $good / $total > 0.8;
+SHRDLU_1
+	warn <<'SHRDLU_2' if $good / $total > 0.8;
    ### You have a good chance to get more information by running
    ###     ./perl harness
    ### in the 't' directory since most (>=80%) of the tests succeeded.
-SHRDLU
-	use Config;
-	if (my $p = $Config{ldlibpthname}) {
-	    warn <<SHRDLU;
+SHRDLU_2
+        if (eval {require Config; import Config; 1}) {
+	    if (my $p = $Config{ldlibpthname}) {
+		warn <<SHRDLU_3;
    ### You may have to set your dynamic library search path,
    ### $p, to point to the build directory:
-SHRDLU
-           if (exists $ENV{$p}) {
-	       warn <<SHRDLU;
+SHRDLU_3
+                if (exists $ENV{$p} && $ENV{$p} ne '') {
+		    warn <<SHRDLU_4a;
    ###     setenv $p `pwd`:\$$p; cd t; ./perl harness
    ###     $p=`pwd`:\$$p; export $p; cd t; ./perl harness
    ###     export $p=`pwd`:\$$p; cd t; ./perl harness
-SHRDLU
-            } else {
-		warn <<SHRDLU;
+SHRDLU_4a
+                } else {
+		    warn <<SHRDLU_4b;
    ###     setenv $p `pwd`; cd t; ./perl harness
    ###     $p=`pwd`; export $p; cd t; ./perl harness
    ###     export $p=`pwd`; cd t; ./perl harness
-SHRDLU
-            }    
-	    warn <<SHRDLU;
+SHRDLU_4b
+                }    
+		warn <<SHRDLU_5;
    ### for csh-style shells, like tcsh; or for traditional/modern
    ### Bourne-style shells, like bash, ksh, and zsh, respectively.
-SHRDLU
+SHRDLU_5
+            }
 	}
     }
     ($user,$sys,$cuser,$csys) = times;
diff --git a/t/op/regexp.t b/t/op/regexp.t
index 6d33580b30..3cebee993a 100755
--- a/t/op/regexp.t
+++ b/t/op/regexp.t
@@ -69,9 +69,7 @@ while (<TESTS>) {
     $expect =~ s/\\n/\n/g;
     $expect = $repl = '-' if $skip_amp and $input =~ /\$[&\`\']/;
     $skip = ($skip_amp ? ($result =~ s/B//i) : ($result =~ s/B//));
-    # Certain tests don't work with utf8 (the re_test should be in UTF8)
-#    $skip = 1, $reason = 'utf8'
-#      if ($^H &= ~0x00000008) && $pat =~ /\[:\^(alnum|print|word|ascii|xdigit):\]/;
+    $reason = 'skipping $&' if $reason eq  '' && $skip_amp;
     $result =~ s/B//i unless $skip;
     for $study ('', 'study \$subject') {
  	$c = $iters;