[patch] blead@25282

From: "John E. Malmberg" <wb8tyw@qsl.net>
Message-ID: <42FACA63.4030805@qsl.net>

p4raw-id: //depot/perl@25283

diff --git a/t/op/exec.t b/t/op/exec.t
index 5f110be..8e0e16f 100755 (executable)
--- a/t/op/exec.t
+++ b/t/op/exec.t
@@ -90,6 +90,7 @@ is( system(qq{$Perl "-I../lib" -e "use vmsish qw(hushed); exit 1"}), $exit_one,
     'Explicit exit of 1' );
 
 $rc = system { "lskdfj" } "lskdfj";
+$rc = 256 if ($rc == 5632) && $Is_VMS;
 unless( ok($rc == 255 << 8 or $rc == -1 or $rc == 256 or $rc == 512) ) {
     print "# \$rc == $rc\n";
 }

diff --git a/t/run/exit.t b/t/run/exit.t
index 5075b93..90eeafc 100644 (file)
--- a/t/run/exit.t
+++ b/t/run/exit.t
@@ -11,24 +11,28 @@ BEGIN {
 # Run some code, return its wait status.
 sub run {
     my($code) = shift;
+    $code = "\"" . $code . "\"" if $^O eq 'VMS'; #VMS needs quotes for this.
     return system($^X, "-e", $code);
 }
 
 BEGIN {
     # MacOS system() doesn't have good return value
-    $numtests = ($^O eq 'VMS') ? 9 : ($^O eq 'MacOS') ? 0 : 17;
+    $numtests = ($^O eq 'VMS') ? 14 : ($^O eq 'MacOS') ? 0 : 17;
 }
 
 require "test.pl";
 plan(tests => $numtests);
 
+my $native_success = 0;
+   $native_success = 1 if $^O eq 'VMS';
+
 if ($^O ne 'MacOS') {
 my $exit, $exit_arg;
 
 $exit = run('exit');
 is( $exit >> 8, 0,              'Normal exit' );
 is( $exit, $?,                  'Normal exit $?' );
-is( ${^CHILD_ERROR_NATIVE}, 0,  'Normal exit ${^CHILD_ERROR_NATIVE}' );
+is( ${^CHILD_ERROR_NATIVE}, $native_success,  'Normal exit ${^CHILD_ERROR_NATIVE}' );
 
 if ($^O ne 'VMS') {
   my $posix_ok = eval { require POSIX; };
@@ -66,33 +70,69 @@ if ($^O ne 'VMS') {
 
 } else {
 
-# On VMS, successful returns from system() are always 0, warnings are 1,
-# errors are 2, and fatal errors are 4.
+# On VMS, successful returns from system() are reported 0,  VMS errors that
+# can not be translated to UNIX are reported as EVMSERR, which has a value
+# of 65535. Codes from 2 through 7 are assumed to be from non-compliant
+# VMS systems and passed through.  Programs written to use _POSIX_EXIT()
+# codes like GNV will pass the numbers 2 through 255 encoded in the
+# C facility by multiplying the number by 8 and adding %x35A000 to it.
+# Perl will decode that number from children back to it's internal status.
+#
+# For native VMS status codes, success codes are odd numbered, error codes
+# are even numbered.  The 3 LSBs of the code indicate if the success is
+# an informational message or the severity of the failure.
+#
+# Because the failure codes for the tests of the CLI facility status codes can
+# not be translated to UNIX error codes, they will be reported as EVMSERR,
+# even though Perl will exit with them having the VMS status codes.
+#
+# Note that this is testing the perl exit() routine, and not the VMS
+# DCL EXIT statement.
+#
+# The value %x1000000 has been added to the exit code to prevent the
+# status message from being sent to the STDOUT and STDERR stream.
+#
+# Double quotes are needed to pass these commands through DCL to PERL
 
-  $exit = run("exit 196609"); # %CLI-S-NORMAL
-  is( $exit >> 8, 0,             'success exit' );
+  $exit = run("exit 268632065"); # %CLI-S-NORMAL
+  is( $exit, 0,             'PERL success exit' );
+  is( ${^CHILD_ERROR_NATIVE} & 7, 1, 'VMS success exit' );
 
-  $exit = run("exit 196611");  # %CLI-I-NORMAL
-  is( $exit >> 8, 0,             'informational exit' );
+  $exit = run("exit 268632067");  # %CLI-I-NORMAL
+  is( $exit, 0,             'PERL informational exit' );
+  is( ${^CHILD_ERROR_NATIVE} & 7, 3, 'VMS informational exit' );
 
-  $exit = run("exit 196608");  # %CLI-W-NORMAL
-  is( $exit >> 8, 1,             'warning exit' );
+  $exit = run("exit 268632064");  # %CLI-W-NORMAL
+  is( $exit != 0, 1,             'Perl warning exit' );
+  is( ${^CHILD_ERROR_NATIVE} & 7, 0, 'VMS warning exit' );
 
-  $exit = run("exit 196610");  # %CLI-E-NORMAL
-  is( $exit >> 8, 2,             'error exit' );
+  $exit = run("exit 268632066");  # %CLI-E-NORMAL
+  is( $exit != 0, 1,             'Perl error exit' );
+  is( ${^CHILD_ERROR_NATIVE} & 7, 2, 'VMS error exit' );
 
-  $exit = run("exit 196612");  # %CLI-F-NORMAL
-  is( $exit >> 8, 4,             'fatal error exit' );
+  $exit = run("exit 268632068");  # %CLI-F-NORMAL
+  is( $exit != 0, 1,             'Perl fatal error exit' );
+  is( ${^CHILD_ERROR_NATIVE} & 7, 4, 'VMS fatal exit' );
 }
 
 $exit_arg = 42;
 $exit = run("END { \$? = $exit_arg }");
 
 # On VMS, in the child process the actual exit status will be SS$_ABORT, 
-# which is what you get from any non-zero value of $? that has been 
-# dePOSIXified by STATUS_UNIX_SET.  In the parent process, all we'll 
-# see are the severity bits (0-2) shifted left by 8.
-$exit_arg = (44 & 7) if $^O eq 'VMS';  
+# or 44, which is what you get from any non-zero value of $? except for
+# 65535 that has been dePOSIXified by STATUS_UNIX_SET.  If $? is set to
+# 65535 internally when there is a VMS status code that is valid, and
+# when Perl exits, it will set that status code.
+#
+# In this test on VMS, the child process exit with a SS$_ABORT, which
+# the parent stores in ${^CHILD_ERROR_NATIVE}.  The SS$_ABORT code is
+# then translated to the UNIX code EINTR which has the value of 4 on VMS.
+#
+# This is complex because Perl translates internally generated UNIX
+# status codes to SS$_ABORT on exit, but passes through unmodified UNIX
+# status codes that exit() is called with by scripts.
+
+$exit_arg = 4 if $^O eq 'VMS';  
 
 is( $exit >> 8, $exit_arg,             'Changing $? in END block' );
 }