Two Cygwin patches from Gerrit.

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

diff --git a/t/comp/require.t b/t/comp/require.t
index ea4b96d..78ac436 100755 (executable)
--- a/t/comp/require.t
+++ b/t/comp/require.t
@@ -10,8 +10,9 @@ BEGIN {
 $i = 1;
 
 my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;
-my $total_tests = 23;
-if ($Is_EBCDIC) { $total_tests = 20; }
+my $Is_UTF8   = (${^OPEN} || "") =~ /:utf8/;
+my $total_tests = 29;
+if ($Is_EBCDIC || $Is_UTF8) { $total_tests = 26; }
 print "1..$total_tests\n";
 
 sub do_require {
@@ -129,9 +130,25 @@ dofile();
 sub dofile { do "bleah.do"; };
 print $x;
 
-# UTF-encoded things - skipped on EBCDIC machines
-
-if ($Is_EBCDIC) { exit; }
+# Test that scalar context is forced for require
+
+write_file('bleah.pm', <<'**BLEAH**'
+print "not " if !defined wantarray || wantarray ne '';
+print "ok $i - require() context\n";
+1;
+**BLEAH**
+);
+                              delete $INC{"bleah.pm"}; ++$::i;
+$foo = eval q{require bleah}; delete $INC{"bleah.pm"}; ++$::i;
+@foo = eval q{require bleah}; delete $INC{"bleah.pm"}; ++$::i;
+       eval q{require bleah}; delete $INC{"bleah.pm"}; ++$::i;
+$foo = eval  {require bleah}; delete $INC{"bleah.pm"}; ++$::i;
+@foo = eval  {require bleah}; delete $INC{"bleah.pm"}; ++$::i;
+       eval  {require bleah};
+
+# UTF-encoded things - skipped on EBCDIC machines and on UTF-8 input
+
+if ($Is_EBCDIC || $Is_UTF8) { exit; }
 
 my $utf8 = chr(0xFEFF);