Integrate mainline

p4raw-id: //depot/perlio@12828

3 files changed, 20 insertions, 3 deletions

diff --git a/t/io/fs.t b/t/io/fs.t
index 8a700b2cae..fd326b471c 100755
--- a/t/io/fs.t
+++ b/t/io/fs.t
@@ -172,7 +172,7 @@ else {
         print "ok 21 # skipped: no link\nok 22 # skipped: no link\n";
     }
     else {
-        print "ok 21 # skipped: $^O is neither 'MSWin32' nor 'NetWare'\nok 22 # skipped: $^O is neither 'MSWin32' nor 'NetWare'\n";
+        print "ok 21 # skipped: '$^O' is neither 'MSWin32' nor 'NetWare'\nok 22 # skipped: $^O is neither 'MSWin32' nor 'NetWare'\n";
     }
 }
 
diff --git a/t/op/pat.t b/t/op/pat.t
index 9937e363b7..a94fcaf9ea 100755
--- a/t/op/pat.t
+++ b/t/op/pat.t
@@ -6,7 +6,7 @@
 
 $| = 1;
 
-print "1..750\n";
+print "1..753\n";
 
 BEGIN {
     chdir 't' if -d 't';
@@ -2258,3 +2258,16 @@ print "# some Unicode properties\n";
     print "ok 750\n";
 }
 
+{
+    # 0100;LATIN CAPITAL LETTER A WITH MACRON;Lu;0;L;0041 0304;;;;N;LATIN CAPITAL LETTER A MACRON;;;0101;
+    print "not " unless "\x{0100}" =~ /\w/;
+    print "ok 751\n";
+
+    # 0660;ARABIC-INDIC DIGIT ZERO;Nd;0;AN;;0;0;0;N;;;;;
+    print "not " unless "\x{0660}" =~ /\d/;
+    print "ok 752\n";
+
+    # 1680;OGHAM SPACE MARK;Zs;0;WS;;;;;N;;;;;
+    print "not " unless "\x{1680}" =~ /\s/;
+    print "ok 753\n";
+}
diff --git a/t/op/stat.t b/t/op/stat.t
index dc47ef3885..8d0ca19bc0 100755
--- a/t/op/stat.t
+++ b/t/op/stat.t
@@ -9,7 +9,7 @@ BEGIN {
 
 use Config;
 
-print "1..58\n";
+print "1..59\n";
 
 $Is_MSWin32 = $^O eq 'MSWin32';
 $Is_NetWare = $^O eq 'NetWare';
@@ -281,3 +281,7 @@ if (-f) {print "ok 57\n";} else {print "not ok 57\n";}
 if (-f()) {print "ok 58\n";} else {print "not ok 58\n";}
 
 unlink 'Op.stat.tmp' or print "# unlink failed: $!\n";
+
+# bug id 20011101.069
+my @r = \stat(".");
+if (@r == 13) { print "ok 59\n" } else { print "not ok 59\n" }