Use '!' to mark native integer packings instead of '_'.

[p5sagit/p5-mst-13.2.git] / t / lib / english.t

diff --git a/t/lib/english.t b/t/lib/english.t
index 447dc2c..2ee6133 100755 (executable)
--- a/t/lib/english.t
+++ b/t/lib/english.t
@@ -2,22 +2,26 @@
 
 print "1..16\n";
 
-BEGIN { @INC = '../lib' }
+BEGIN { unshift @INC, '../lib' }
 use English;
 use Config;
-my $threads = $Config{'ccflags'} =~ /-DUSE_THREADS\b/;
+my $threads = $Config{'usethreads'} || 0;
 
 print $PID == $$ ? "ok 1\n" : "not ok 1\n";
 
 $_ = 1;
-print $ARG == $_ ? "ok 2\n" : "not ok 2\n";
+print $ARG == $_  || $threads ? "ok 2\n" : "not ok 2\n";
 
 sub foo {
     print $ARG[0] == $_[0] || $threads ? "ok 3\n" : "not ok 3\n";
 }
 &foo(1);
 
-$ARG = "ok 4\nok 5\nok 6\n";
+if ($threads) {
+    $_ = "ok 4\nok 5\nok 6\n";
+} else {
+    $ARG = "ok 4\nok 5\nok 6\n";
+}
 /ok 5\n/;
 print $PREMATCH, $MATCH, $POSTMATCH;
 
@@ -26,13 +30,13 @@ $ORS = "\n";
 print 'ok',7;
 undef $OUTPUT_FIELD_SEPARATOR;
 
-$LIST_SEPARATOR = "\n";
+if ($threads) { $" = "\n" } else { $LIST_SEPARATOR = "\n" };
 @foo = ("ok 8", "ok 9");
 print "@foo";
 undef $OUTPUT_RECORD_SEPARATOR;
 
 eval 'NO SUCH FUNCTION';
-print "ok 10\n" if $EVAL_ERROR =~ /method/;
+print "ok 10\n" if $EVAL_ERROR =~ /method/ || $threads;
 
 print $UID == $< ? "ok 11\n" : "not ok 11\n";
 print $GID == $( ? "ok 12\n" : "not ok 12\n";