X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fperl5db.t;h=fe392925df23ccdd454836359e2b5a85f6b18ccb;hb=192b9cd13b3ba000f1d0a2d32c141b9513be7936;hp=8735e87a447c840ca7e6340abc4e3af88e263319;hpb=635f2c9e92f8c492655e9f22e378ee92d3368ced;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/perl5db.t b/lib/perl5db.t
index 8735e87..fe39292 100644
--- a/lib/perl5db.t
+++ b/lib/perl5db.t
@@ -14,6 +14,10 @@ BEGIN {
 	print "1..0 # Skip: no /dev/null\n";
 	exit 0;
     }
+    if (!-c "/dev/tty") {
+	print "1..0 # Skip: no /dev/tty\n";
+	exit 0;
+    }
 }
 
 plan(1);
@@ -22,25 +26,34 @@ sub rc {
     open RC, ">", ".perldb" or die $!;
     print RC @_;
     close(RC);
+    # overly permissive perms gives "Must not source insecure rcfile"
+    # and hangs at the DB(1> prompt
+    chmod 0644, ".perldb";
 }
 
+my $target = '../lib/perl5db/t/eval-line-bug';
+
 rc(
     qq|
-    &parse_options("NonStop=0 TTY=/dev/null LineInfo=db.out");
+    &parse_options("NonStop=0 TTY=db.out LineInfo=db.out");
     \n|,
 
     qq|
     sub afterinit {
 	push(\@DB::typeahead,
-	    "DB::print_lineinfo(\@{'main::_<perl5db/eval-line-bug'})",
 	    'b 23',
-	    'c',
+	    'n',
+	    'n',
+	    'n',
+	    'c', # line 23
+	    'n',
+	    "p \\\@{'main::_<$target'}",
 	    'q',
 	);
     }\n|,
 );
 
-runperl(switches => [ '-d' ], progfile => '../lib/perl5db/eval-line-bug');
+runperl(switches => [ '-d' ], progfile => $target);
 
 my $contents;
 {
@@ -50,12 +63,12 @@ my $contents;
     close(I);
 }
 
-like($contents, qr/factorial/,
+like($contents, qr/sub factorial/,
     'The ${main::_<filename} variable in the debugger was not destroyed'
 );
 
 # clean up.
 
 END {
-    unlink '.perldb', 'db.out';
+    unlink qw(.perldb db.out);
 }