Integrate mainline.

p4raw-id: //depot/perlio@10745

4 files changed, 39 insertions, 17 deletions

diff --git a/t/TEST b/t/TEST
index 5fcc26865a..0a63f0e5f0 100755
--- a/t/TEST
+++ b/t/TEST
@@ -190,7 +190,8 @@ EOT
 		or print "can't deparse '$deparse': $!.\n";
 	}
 	elsif ($type eq 'perl') {
-	    my $run = "./perl $testswitch $switch $utf $test |";
+	    my $perl = $ENV{PERL} || './perl';
+	    my $run = "$perl $testswitch $switch $utf $test |";
 	    open(RESULTS,$run) or print "can't run '$run': $!.\n";
 	}
 	else {
@@ -250,9 +251,11 @@ EOT
 	}
 	if ($ENV{PERL_3LOG}) {
 	    my $tpp = $test;
+	    $tpp =~ s:^../::;
 	    $tpp =~ s:/:_:g;
 	    $tpp =~ s:\.t$::;
-	    rename("perl.3log", "perl.3log.$tpp");
+	    rename("perl.3log", "perl.3log.$tpp") ||
+		die "rename: perl3.log to perl.3log.$tpp: $!\n";
 	}
 	$next = $next - 1;
 	if ($ok && $next == $max) {
diff --git a/t/lib/1_compile.t b/t/lib/1_compile.t
index 29db2ccb70..027ced1f2d 100644
--- a/t/lib/1_compile.t
+++ b/t/lib/1_compile.t
@@ -251,6 +251,7 @@ UNIVERSAL
 User::grent
 User::pwent
 XS::Typemap
+attributes
 attrs
 autouse
 base
diff --git a/t/lib/warnings/pp b/t/lib/warnings/pp
index 62f054a6ee..83786a023e 100644
--- a/t/lib/warnings/pp
+++ b/t/lib/warnings/pp
@@ -63,7 +63,7 @@ my $b = { 1,2,3};
 EXPECT
 Odd number of elements in hash assignment at - line 3.
 ########
-# pp.c
+# pp_pack.c
 use warnings 'pack' ;
 use warnings 'unpack' ;
 my @a = unpack ("A,A", "22") ;
@@ -85,7 +85,7 @@ my $c = $$a;
 EXPECT
 Use of uninitialized value in scalar dereference at - line 4.
 ########
-# pp.c
+# pp_pack.c
 use warnings 'pack' ;
 sub foo { my $a = "a"; return $a . $a++ . $a++ }
 my $a = pack("p", &foo) ;
@@ -108,16 +108,16 @@ $_ = "\x80  \xff" ;
 reverse ;
 EXPECT
 ########
-# pp.c
+# pp_pack.c
 use warnings 'pack' ;
-print unpack("C", pack("C",   -1)), "\n";
-print unpack("C", pack("C",    0)), "\n";
-print unpack("C", pack("C",  255)), "\n";
-print unpack("C", pack("C",  256)), "\n";
-print unpack("c", pack("c", -129)), "\n";
-print unpack("c", pack("c", -128)), "\n";
-print unpack("c", pack("c",  127)), "\n";
-print unpack("c", pack("c",  128)), "\n";
+print unpack("C", pack("C",   -1)), "\n",
+	unpack("C", pack("C",    0)), "\n",
+	unpack("C", pack("C",  255)), "\n",
+	unpack("C", pack("C",  256)), "\n",
+	unpack("c", pack("c", -129)), "\n",
+	unpack("c", pack("c", -128)), "\n",
+	unpack("c", pack("c",  127)), "\n",
+	unpack("c", pack("c",  128)), "\n";
 no warnings 'pack' ;
 print unpack("C", pack("C",   -1)), "\n";
 print unpack("C", pack("C",    0)), "\n";
@@ -129,9 +129,9 @@ print unpack("c", pack("c",  127)), "\n";
 print unpack("c", pack("c",  128)), "\n";
 EXPECT
 Character in "C" format wrapped at - line 3.
-Character in "C" format wrapped at - line 6.
-Character in "c" format wrapped at - line 7.
-Character in "c" format wrapped at - line 10.
+Character in "C" format wrapped at - line 3.
+Character in "c" format wrapped at - line 3.
+Character in "c" format wrapped at - line 3.
 255
 0
 255
diff --git a/t/op/pat.t b/t/op/pat.t
index c59e31f87f..942e6e65f9 100755
--- a/t/op/pat.t
+++ b/t/op/pat.t
@@ -6,7 +6,7 @@
 
 $| = 1;
 
-print "1..630\n";
+print "1..632\n";
 
 BEGIN {
     chdir 't' if -d 't';
@@ -1765,3 +1765,21 @@ EOT
     print "ok 630\n";
 }
 
+$_ = "foo";
+
+eval <<"EOT"; die if $@;
+  /f
+   o\r
+   o
+   \$
+  /x && print "ok 631\n";
+EOT
+
+eval <<"EOT"; die if $@;
+  /f
+   o
+   o
+   \$\r
+  /x && print "ok 632\n";
+EOT
+