X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Funi%2Fclass.t;h=bf85d6e99527842201480a24726a4b06baa74306;hb=a2309040b8fe324ae09c064137c624b4292d93c1;hp=225b77030d195bf2a065838a23b56ae7e0d69224;hpb=250d67eb8e42c118b44bb5437965a1f4a8a0d828;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/uni/class.t b/t/uni/class.t
index 225b770..bf85d6e 100644
--- a/t/uni/class.t
+++ b/t/uni/class.t
@@ -4,7 +4,7 @@ BEGIN {
     require "test.pl";
 }
 
-plan tests => 4670;
+plan tests => 4784;
 
 sub MyUniClass {
   <<END;
@@ -159,7 +159,10 @@ for my $p ('gc', 'sc') {
       for my $y ($abbr, $utf8::PropValueAlias{$p}{$abbr}, $utf8::PVA_abbr_map{gc_sc}{$abbr}) {
         is($str =~ /(\p{$x: $y}+)/ && $1, substr($str, 0, -1));
         is($str =~ /(\P{$x= $y}+)/ && $1, substr($str, -1));
-	test_regexp ($str, $y);
+        SKIP: {
+	  skip("surrogate", 1) if $abbr eq 'cs';
+ 	  test_regexp ($str, $y);
+        }
       }
     }
   }
@@ -168,7 +171,7 @@ for my $p ('gc', 'sc') {
 # test extra properties (ASCII_Hex_Digit, Bidi_Control, etc.)
 SKIP:
 {
-  skip "Can't reliably derive class names from file names", 592 if $^O eq 'VMS';
+  skip "Can't reliably derive class names from file names", 576 if $^O eq 'VMS';
 
   # On case tolerant filesystems, Cf.pl will cause a -e test for cf.pl to
   # return true. Try to work around this by reading the filenames explicitly
@@ -221,8 +224,11 @@ for (grep $utf8::Canonical{$_} =~ /^In/, keys %utf8::Canonical) {
 
   my $blk = $_;
 
-  test_regexp ($str, $blk);
-  $blk =~ s/^In/Block:/;
-  test_regexp ($str, $blk);
+  SKIP: {
+    skip($blk, 2) if $blk =~ /surrogates/i;
+    test_regexp ($str, $blk);
+    $blk =~ s/^In/Block:/;
+    test_regexp ($str, $blk);
+  }
 }