Integrate mainline

p4raw-id: //depot/perlio@14362

4 files changed, 12 insertions, 7 deletions

diff --git a/t/comp/script.t b/t/comp/script.t
index 2dbdaf2afc..6efffdf81a 100755
--- a/t/comp/script.t
+++ b/t/comp/script.t
@@ -3,10 +3,10 @@
 BEGIN {
     chdir 't';
     @INC = '../lib';
-    require './test.pl';
+    require './test.pl';	# for which_perl() etc
 }
 
-my $Perl = which_perl;
+my $Perl = which_perl();
 
 print "1..3\n";
 
diff --git a/t/op/oct.t b/t/op/oct.t
index 06bcf3e402..f996b48975 100755
--- a/t/op/oct.t
+++ b/t/op/oct.t
@@ -2,7 +2,7 @@
 
 # tests 51 onwards aren't all warnings clean. (intentionally)
 
-print "1..69\n";
+print "1..71\n";
 
 my $test = 1;
 
@@ -145,3 +145,8 @@ test ('hex', "x3A",	 0x3A);
 test ('hex', "0x4",	 4);
 test ('hex', "x4",	 4);
 
+eval '$a = oct "10\x{100}"';
+print $@ =~ /Wide character/ ? "ok $test\n" : "not ok $test\n"; $test++;
+
+eval '$a = hex "ab\x{100}"';
+print $@ =~ /Wide character/ ? "ok $test\n" : "not ok $test\n"; $test++;
diff --git a/t/op/stat.t b/t/op/stat.t
index 4857836ddf..1c0d4b25ba 100755
--- a/t/op/stat.t
+++ b/t/op/stat.t
@@ -3,7 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
-    require './test.pl';
+    require './test.pl';	# for which_perl() etc
 }
 
 use Config;
@@ -11,7 +11,7 @@ use File::Spec;
 
 plan tests => 69;
 
-my $Perl = which_perl;
+my $Perl = which_perl();
 
 $Is_Amiga   = $^O eq 'amigaos';
 $Is_Cygwin  = $^O eq 'cygwin';
diff --git a/t/run/fresh_perl.t b/t/run/fresh_perl.t
index 73680ebc58..d59d0da7b8 100644
--- a/t/run/fresh_perl.t
+++ b/t/run/fresh_perl.t
@@ -22,12 +22,12 @@
 BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
-    require './test.pl';
+    require './test.pl';	# for which_perl() etc
 }
 
 use strict;
 
-my $Perl = which_perl;
+my $Perl = which_perl();
 
 $|=1;