Integrate mainline

p4raw-id: //depot/perlio@12507

2 files changed, 18 insertions, 3 deletions

diff --git a/t/op/groups.t b/t/op/groups.t
index 0531826dba..3228729426 100755
--- a/t/op/groups.t
+++ b/t/op/groups.t
@@ -100,8 +100,11 @@ print "1..2\n";
 
 $pwgid = $( + 0;
 ($pwgnam) = getgrgid($pwgid);
-@basegroup{$pwgid,$pwgnam} = (1,1);
-
+if ($^O eq 'cygwin') { # basegroup on Cygwin has id = 0.
+    @basegroup{$pwgid,$pwgnam} = (0,0);
+} else {
+    @basegroup{$pwgid,$pwgnam} = (1,1);
+}
 $seen{$pwgid}++;
 
 for (split(' ', $()) {
diff --git a/t/op/pat.t b/t/op/pat.t
index 0f978d106b..66179212b2 100755
--- a/t/op/pat.t
+++ b/t/op/pat.t
@@ -6,7 +6,7 @@
 
 $| = 1;
 
-print "1..747\n";
+print "1..750\n";
 
 BEGIN {
     chdir 't' if -d 't';
@@ -2243,3 +2243,15 @@ print "# some Unicode properties\n";
     print "not " unless "\x{AC00}" =~ /\p{HangulSyllable}/;
     print "ok 747\n";
 }
+
+{
+    print "not " unless "\x{0100}" =~ /\p{Script=Latin}/;
+    print "ok 748\n";
+
+    print "not " unless "\x{0100}" =~ /\p{Block=LatinExtendedA}/;
+    print "ok 749\n";
+
+    print "not " unless "\x{0100}" =~ /\p{Category=UppercaseLetter}/;
+    print "ok 750\n";
+}
+