[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4549ed12ec3337313c14815438fa9aee88bf1359 (commit)
       via  bfa3480f7609351563ac36dddd7c64e97aa6f446 (commit)
       via  984cf15eb5faac8e328d1ba4a623b1777eb82de1 (commit)
      from  313fa47fea55fdf4076b8126dcacd68536083014 (commit)


- Log -----------------------------------------------------------------
commit 4549ed12ec3337313c14815438fa9aee88bf1359
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jul 7 11:11:33 2017 +0200

    test/run_tests.pl: Make sure to exit with a code that's understood universally
    
    TAP::Parser::Aggregator::has_errors may return any number, not just 0
    and 1.  With Perl on VMS, any number from 2 and on is interpreted as a
    VMS status, the 3 lower bits are the encoded severity (1 = SUCCESS,
    for example), so depending on what has_errors returns, a test failure
    might be interpreted as a success.  Therefore, it's better to make
    sure the exit code is 0 or 1, nothing else (they are special on VMS,
    and mean SUCCESS or FAILURE, to match Unix conventions).
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3880)

commit bfa3480f7609351563ac36dddd7c64e97aa6f446
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jul 7 11:10:05 2017 +0200

    test/recipes/90-test_shlibload.t: Make sure to handle library renames
    
    VMS renames our libraries to fit VMS conventions.  This must be accounted
    for when we want to load them.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3880)

commit 984cf15eb5faac8e328d1ba4a623b1777eb82de1
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jul 7 11:09:19 2017 +0200

    VMS: When running a sub-MMS, make sure to give it the main MMS' qualifiers
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3880)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/descrip.mms.tmpl  |  2 +-
 test/recipes/90-test_shlibload.t |  6 ++++--
 test/run_tests.pl                | 11 ++++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index b1e5d70..31671e3 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -91,7 +91,7 @@
   sub dependmagic {
       my $target = shift;
 
-      return "$target : build_generated\n\t\pipe \$(MMS) depend && \$(MMS) _$target\n_$target";
+      return "$target : build_generated\n\t\pipe \$(MMS) \$(MMSQUALIFIERS) depend && \$(MMS) \$(MMSQUALIFIERS) _$target\n_$target";
   }
   #use Data::Dumper;
   #print STDERR "DEBUG: before:\n", Dumper($unified_info{before});
diff --git a/test/recipes/90-test_shlibload.t b/test/recipes/90-test_shlibload.t
index 9058ba5..aa8d98d 100644
--- a/test/recipes/90-test_shlibload.t
+++ b/test/recipes/90-test_shlibload.t
@@ -22,10 +22,12 @@ plan skip_all => "Test only supported in a shared build" if disabled("shared");
 
 plan tests => 3;
 
+my $libcrypto_idx = $unified_info{rename}->{libcrypto} // "libcrypto";
+my $libssl_idx = $unified_info{rename}->{libssl} // "libssl";
 my $libcrypto =
-    $unified_info{sharednames}->{libcrypto}.$target{shared_extension_simple};
+    $unified_info{sharednames}->{$libcrypto_idx}.$target{shared_extension_simple};
 my $libssl =
-    $unified_info{sharednames}->{libssl}.$target{shared_extension_simple};
+    $unified_info{sharednames}->{$libssl_idx}.$target{shared_extension_simple};
 
 ok(run(test(["shlibloadtest", "-crypto_first", $libcrypto, $libssl])),
    "running shlibloadtest -crypto_first");
diff --git a/test/run_tests.pl b/test/run_tests.pl
index a91d761..66f620e 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -85,7 +85,16 @@ my $harness = $TAP_Harness->new(\%tapargs);
 my $ret = $harness->runtests(map { abs2rel($_, rel2abs(curdir())); }
                                  sort keys %tests);
 
-exit $ret->has_errors if (ref($ret) eq "TAP::Parser::Aggregator");
+# $ret->has_errors may be any number, not just 0 or 1.  On VMS, numbers
+# from 2 and on are used as is as VMS statuses, which has severity encoded
+# in the lower 3 bits.  0 and 1, on the other hand, generate SUCCESS and
+# FAILURE, so for currect reporting on all platforms, we make sure the only
+# exit codes are 0 and 1.  Double-bang is the trick to do so.
+exit !!$ret->has_errors if (ref($ret) eq "TAP::Parser::Aggregator");
+
+# If this isn't a TAP::Parser::Aggregator, it's the pre-TAP test harness,
+# which simply dies at the end if any test failed, so we don't need to bother
+# with any exit code in that case.
 
 sub find_matching_tests {
     my ($glob) = @_;