Integrate mainline

p4raw-id: //depot/perlio@14674

2 files changed, 5 insertions, 3 deletions

diff --git a/t/op/length.t b/t/op/length.t
index 763a8c1ecd..d1cfda1da6 100644
--- a/t/op/length.t
+++ b/t/op/length.t
@@ -43,7 +43,7 @@ print "ok 3\n";
     if (ord('A') == 193)
      {
       printf "#%vx for 0xFF\n",$a;
-      print "not " unless $a eq "\x80\x45" && length($a) == 2;
+      print "not " unless $a eq "\x8b\x73" && length($a) == 2;
      }
     else
      {
diff --git a/t/uni/fold.t b/t/uni/fold.t
index 936a690343..789ba67029 100644
--- a/t/uni/fold.t
+++ b/t/uni/fold.t
@@ -15,13 +15,15 @@ if (open(CF, $CF)) {
     my @CF;
 
     while (<CF>) {
-        if (/^([0-9A-F]+); ([CFSI]); ((?:[0-9A-F]+)(?: [0-9A-F]+)*); \# (.+)/) {
-            next if $2 eq 'S'; # we are going for 'F'ull case folding
+	# Skip S since we are going for 'F'ull case folding
+        if (/^([0-9A-F]+); ([CFI]); ((?:[0-9A-F]+)(?: [0-9A-F]+)*); \# (.+)/) {
 	    next if EBCDIC && hex $1 < 0x100;
 	    push @CF, [$1, $2, $3, $4];
 	}
     }
 
+    close(CF);
+
     die qq[$0: failed to find casefoldings from "$CF"\n] unless @CF;
 
     print "1..", scalar @CF, "\n";