X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Fdie_exit.t;h=fedef945e1ed1d73d8d0c2f63f84ea9834170196;hb=b3a3b3a1da8f5142edf3e194532b08316f895282;hp=7808d9d7c5086f2d8ecf3e86f8e0994bb64ea794;hpb=93430cb427caeba01ba89b008008b46159a7c165;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/op/die_exit.t b/t/op/die_exit.t
index 7808d9d..fedef94 100755
--- a/t/op/die_exit.t
+++ b/t/op/die_exit.t
@@ -7,9 +7,15 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib' if -e '../lib';
+    @INC = '../lib';
 }
-my $perl = -e '../perl' ? '../perl' : -e './perl' ? './perl' : 'perl';
+
+if ($^O eq 'mpeix') {
+    print "1..0 # Skip: broken on MPE/iX\n";
+    exit 0;
+}
+
+$| = 1;
 
 use strict;
 
@@ -38,16 +44,29 @@ my $max = keys %tests;
 
 print "1..$max\n";
 
+# Dump any error messages from the dying processes off to a temp file.
+open(STDERR, ">die_exit.err") or die "Can't open temp error file:  $!";
+
 foreach my $test (1 .. $max) {
     my($bang, $query, $code) = @{$tests{$test}};
     $code ||= 'die;';
-    my $exit =
-	($^O eq 'MSWin32'
-	 ? system qq($perl -e "\$! = $bang; \$? = $query; $code" 2> nul)
-	 : system qq($perl -e '\$! = $bang; \$? = $query; $code' 2> /dev/null));
+    if ($^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'VMS') {
+        system(qq{$^X -e "\$! = $bang; \$? = $query; $code"});
+    }
+    else {
+        system(qq{$^X -e '\$! = $bang; \$? = $query; $code'});
+    }
+    my $exit = $?;
+
+    # VMS exit code 44 (SS$_ABORT) is returned if a program dies.  We only get
+    # the severity bits, which boils down to 4.  See L<perlvms/$?>.
+    $bang = 4 if $^O eq 'VMS';
 
     printf "# 0x%04x  0x%04x  0x%04x\n", $exit, $bang, $query;
     print "not " unless $exit == (($bang || ($query >> 8) || 255) << 8);
     print "ok $test\n";
 }
     
+close STDERR;
+END { 1 while unlink 'die_exit.err' }
+