t/op/taint.t follow-up to #23635

[p5sagit/p5-mst-13.2.git] / t / op / readline.t

diff --git a/t/op/readline.t b/t/op/readline.t
index d127d58..d047f16 100644 (file)
--- a/t/op/readline.t
+++ b/t/op/readline.t
@@ -6,7 +6,7 @@ BEGIN {
     require './test.pl';
 }
 
-plan tests => 11;
+plan tests => 13;
 
 eval { for (\2) { $_ = <FH> } };
 like($@, 'Modification of a read-only value attempted', '[perl #19566]');
@@ -20,21 +20,23 @@ like($@, 'Modification of a read-only value attempted', '[perl #19566]');
 }
 
 # 82 is chosen to exceed the length for sv_grow in do_readline (80)
-foreach my $k ('k', 'k'x82) {
+foreach my $k (1, 82) {
   my $result
-    = runperl (switches => '-l', stdin => '', stderr => 1,
-              prog => "%a = qw($k v); \$_ = <> foreach keys %a; print qw(end)",
+    = runperl (stdin => '', stderr => 1,
+              prog => "\$x = q(k) x $k; \$a{\$x} = qw(v); \$_ = <> foreach keys %a; print qw(end)",
              );
-  is ($result, "end", '[perl #21614] for length ' . length $k);
+  $result =~ s/\n\z// if $^O eq 'VMS';
+  is ($result, "end", '[perl #21614] for length ' . length('k' x $k));
 }
 
 
-foreach my $k ('perl', 'perl'x21) {
+foreach my $k (1, 21) {
   my $result
-    = runperl (switches => '-l', stdin => ' rules', stderr => 1,
-              prog => "%a = qw($k v); foreach (keys %a) {\$_ .= <>; print}",
+    = runperl (stdin => ' rules', stderr => 1,
+              prog => "\$x = q(perl) x $k; \$a{\$x} = q(v); foreach (keys %a) {\$_ .= <>; print}",
              );
-  is ($result, "$k rules", 'rcatline to shared sv for length ' . length $k);
+  $result =~ s/\n\z// if $^O eq 'VMS';
+  is ($result, ('perl' x $k) . " rules", 'rcatline to shared sv for length ' . length('perl' x $k));
 }
 
 foreach my $l (1, 82) {
@@ -53,6 +55,30 @@ foreach my $l (1, 21) {
   $k .= <DATA>;
   is ($k, "$perl rules\n", 'rcatline to COW sv for length ' . length $perl);
 }
+
+use strict;
+use File::Spec;
+
+open F, File::Spec->curdir and sysread F, $_, 1;
+my $err = $! + 0;
+close F;
+
+SKIP: {
+  skip "you can read directories as plain files", 2 unless( $err );
+
+  $!=0;
+  open F, File::Spec->curdir and $_=<F>;
+  ok( $!==$err && !defined($_) => 'readline( DIRECTORY )' );
+  close F;
+
+  $!=0;
+  { local $/;
+    open F, File::Spec->curdir and $_=<F>;
+    ok( $!==$err && !defined($_) => 'readline( DIRECTORY ) slurp mode' );
+    close F;
+  }
+}
+
 __DATA__
 moo
 moo