Integrate from mainperl.

p4raw-id: //depot/cfgperl@2449

2 files changed, 17 insertions, 8 deletions

diff --git a/t/op/goto.t b/t/op/goto.t
index a62c89925b..8096aff0f2 100755
--- a/t/op/goto.t
+++ b/t/op/goto.t
@@ -2,7 +2,7 @@
 
 # "This IS structured code.  It's just randomly structured."
 
-print "1..12\n";
+print "1..13\n";
 
 while ($?) {
     $foo = 1;
@@ -54,7 +54,7 @@ sub bar {
 exit;
 
 FINALE:
-print "ok 12\n";
+print "ok 13\n";
 exit;
 
 bypass:
@@ -93,5 +93,13 @@ print $@ =~ /Can't find label NOWHERE/ ? "ok 8\n" : "not ok 8\n";
   for (9..11)	{ start(bless([$_]), 'bar'); }
 }
 
+sub auto {
+    goto &loadit;
+}
+
+sub AUTOLOAD { print @_ }
+
+auto("ok 12\n");
+
 $wherever = FINALE;
 goto $wherever;
diff --git a/t/op/tr.t b/t/op/tr.t
index 3503c3cf12..486b4515d5 100755
--- a/t/op/tr.t
+++ b/t/op/tr.t
@@ -22,12 +22,13 @@ print "ok 3\n";
 # In EBCDIC 'I' is \xc9 and 'J' is \0xd1, 'i' is \x89 and 'j' is \x91.
 # Yes, discontinuities.  Regardless, the \xca in the below should stay
 # untouched (and not became \x8a).
+{
+    no utf8;
+    $_ = "I\xcaJ";
 
-$_ = "I\xcaJ";
-
-tr/I-J/i-j/;
-
-print "not " unless $_ eq "i\xcaj";
-print "ok 4\n";
+    tr/I-J/i-j/;
 
+    print "not " unless $_ eq "i\xcaj";
+    print "ok 4\n";
+}
 #