X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fcharnames.t;h=f74453ded76fb6c7fa25b9521058816e7f3ffc82;hb=163ba113b958ebef4215df1e1b04445b4a85504f;hp=4889562455b05c39d59cfb0e9cdeeccdc88dea89;hpb=0642d82a230efbe169e4a441b6943c36ff880a90;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/charnames.t b/lib/charnames.t
index 4889562..f74453d 100644
--- a/lib/charnames.t
+++ b/lib/charnames.t
@@ -15,7 +15,7 @@ require File::Spec;
 
 $| = 1;
 
-print "1..78\n";
+print "1..79\n";
 
 use charnames ':full';
 
@@ -176,28 +176,14 @@ print "ok 24\n";
 print "not " unless "\N{NULL}" eq "\c@";
 print "ok 25\n";
 
-if ($^O eq 'MacOS')
-{
-	print "not " unless "\N{CARRIAGE RETURN (CR)}" eq "\n";
-	print "ok 26\n";
-
-	print "not " unless "\N{CARRIAGE RETURN}" eq "\n";
-	print "ok 27\n";
-
-	print "not " unless "\N{CR}" eq "\n";
-	print "ok 28\n";
-}
-else
-{
-	print "not " unless "\N{LINE FEED (LF)}" eq "\n";
-	print "ok 26\n";
+print "not " unless "\N{LINE FEED (LF)}" eq "\n";
+print "ok 26\n";
 
-	print "not " unless "\N{LINE FEED}" eq "\n";
-	print "ok 27\n";
+print "not " unless "\N{LINE FEED}" eq "\n";
+print "ok 27\n";
 
-	print "not " unless "\N{LF}" eq "\n";
-	print "ok 28\n";
-}
+print "not " unless "\N{LF}" eq "\n";
+print "ok 28\n";
 
 my $nel = ord("A") == 193 ? qr/^(?:\x15|\x25)$/ : qr/^\x85$/;
 
@@ -271,10 +257,8 @@ print "ok 46\n";
 
 # ---- Alias extensions
 
-my $tmpfile = tempfile();
 my $alifile = File::Spec->catfile(File::Spec->updir, qw(lib unicore xyzzy_alias.pl));
 my $i = 0;
-END { if ($tmpfile) { 1 while unlink $tmpfile; } }
 
 my @prgs;
 {   local $/ = undef;
@@ -285,6 +269,7 @@ my $i = 46;
 for (@prgs) {
     my ($code, $exp) = ((split m/\nEXPECT\n/), '$');
     my ($prog, $fil) = ((split m/\nFILE\n/, $code), "");
+    my $tmpfile = tempfile();
     open my $tmp, "> $tmpfile" or die "Could not open $tmpfile: $!";
     print $tmp $prog, "\n";
     close $tmp or die "Could not close $tmpfile: $!";
@@ -303,10 +288,6 @@ for (@prgs) {
     $res =~ s/\n%[A-Z]+-[SIWEF]-.*$//		# clip off DCL status msg
 	if $^O eq "VMS";
     $exp =~ s/[\r\n]+$//;
-    if ($^O eq "MacOS") {
-	$exp =~ s{(\./)?abc\.pm}{:abc.pm}g;
-	$exp =~ s{./abc}        {:abc}g;
-	}
     my $pfx = ($res =~ s/^PREFIX\n//);
     my $rexp = qr{^$exp};
     if ($res =~ s/^SKIPPED\n//) {
@@ -322,7 +303,6 @@ for (@prgs) {
         print "not ";
 	}
     print "ok ", ++$i, "\n";
-    1 while unlink $tmpfile;
     $fil or next;
     1 while unlink $alifile;
     }
@@ -358,6 +338,10 @@ if ($@) {
     print "ok 78\n";
 }
 
+# Verify that db includes the normative NameAliases.txt names
+print "not " unless "\N{U+1D0C5}" eq "\N{BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON CHROMA VASIS}";
+print "ok 79\n";
+
 __END__
 # unsupported pragma
 use charnames ":scoobydoo";