C++: Solaris CC now compiles "perl"

[p5sagit/p5-mst-13.2.git] / t / comp / require.t

diff --git a/t/comp/require.t b/t/comp/require.t
index ae3da43..d06834a 100755 (executable)
--- a/t/comp/require.t
+++ b/t/comp/require.t
@@ -183,15 +183,26 @@ $foo = eval  {require bleah}; delete $INC{"bleah.pm"}; ++$::i;
 my $r = "threads";
 eval { require $r };
 $i++;
-if($@ =~ /Directory .*threads not allowed in require/) {
+if($@ =~ /Can't locate threads in \@INC/) {
     print "ok $i\n";
 } else {
     print "not ok $i\n";
 }
 
-############################
-#### Add new tests here ####
-############################
+
+write_file('bleah.pm', qq(die "This is an expected error";\n));
+delete $INC{"bleah.pm"}; ++$::i;
+eval { CORE::require bleah; };
+if ($@ =~ /^This is an expected error/) {
+    print "ok $i\n";
+} else {
+    print "not ok $i\n";
+}
+
+##########################################
+# What follows are UTF-8 specific tests. #
+# Add generic tests before this point.   #
+##########################################
 
 # UTF-encoded things - skipped on EBCDIC machines and on UTF-8 input
 
@@ -209,15 +220,6 @@ sub bytes_to_utf16 {
 $i++; do_require(bytes_to_utf16('n', qq(print "ok $i\\n"; 1;\n), 1)); # BE
 $i++; do_require(bytes_to_utf16('v', qq(print "ok $i\\n"; 1;\n), 1)); # LE
 
-write_file('bleah.pm', qq(die "This is an expected error";\n));
-delete $INC{"bleah.pm"}; ++$::i;
-eval { CORE::require bleah; };
-if ($@ =~ /^This is an expected error/) {
-    print "ok $i\n";
-} else {
-    print "not ok $i\n";
-}
-
 END {
     1 while unlink 'bleah.pm';
     1 while unlink 'bleah.do';