[openssl] master update

[dev at ddvo.net]

The branch master has been updated
       via  b9cd82f95bf99eab4e1b0420918e7139db091c4b (commit)
       via  cfe20aee3b84934271ba6ab4a054dc7a7ddebb2e (commit)
       via  c6df354c2a2295ed120161a5a183e885df3ae1a6 (commit)
      from  aed03a12096cbcce30a133c179336072fdad64d1 (commit)


- Log -----------------------------------------------------------------
commit b9cd82f95bf99eab4e1b0420918e7139db091c4b
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Sat Apr 3 15:53:16 2021 +0200

    80-test_cmp_http.t: Extend diagnostics of mock server launch
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14839)

commit cfe20aee3b84934271ba6ab4a054dc7a7ddebb2e
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Sat Apr 3 14:28:17 2021 +0200

    80-test_cmp_http.t: Silence check for availability of 'kill' and 'lsof' commands
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14839)

commit c6df354c2a2295ed120161a5a183e885df3ae1a6
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Sat Apr 3 14:25:54 2021 +0200

    80-test_cmp_http.t: Fix resumption when skipping after mock server launch failed
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14839)

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

Summary of changes:
 test/recipes/80-test_cmp_http.t | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/recipes/80-test_cmp_http.t b/test/recipes/80-test_cmp_http.t
index 80cb6a4122..bfae899040 100644
--- a/test/recipes/80-test_cmp_http.t
+++ b/test/recipes/80-test_cmp_http.t
@@ -34,9 +34,9 @@ plan skip_all => "Tests involving local HTTP server not available on Windows, AI
 plan skip_all => "Tests involving local HTTP server not available in cross-compile builds"
     if defined $ENV{EXE_SHELL};
 plan skip_all => "Tests involving local HTTP server require 'kill' command"
-    if system("which kill");
+    if system("which kill >/dev/null");
 plan skip_all => "Tests involving local HTTP server require 'lsof' command"
-    if system("which lsof"); # this typically excludes Solaris
+    if system("which lsof >/dev/null"); # this typically excludes Solaris
 
 sub chop_dblquot { # chop any leading and trailing '"' (needed for Windows)
     my $str = shift;
@@ -180,6 +180,7 @@ indir data_dir() => sub {
         $server_name = chop_dblquot($server_name);
         load_config($server_name, $server_name);
         {
+          SKIP: {
             my $pid;
             if ($server_name eq "Mock") {
                 indir "Mock" => sub {
@@ -198,6 +199,7 @@ indir data_dir() => sub {
                 };
             };
             stop_mock_server($pid) if $pid;
+          }
         }
     };
 };
@@ -277,7 +279,8 @@ sub start_mock_server {
         print "Mock server already running with pid=$pid\n";
         return $pid;
     }
-    print "Launching mock server: $cmd\n";
+    print "Current directory is ".getcwd()."\n";
+    print "Launching mock server listening on port $server_port: $cmd\n";
     return system("$cmd &") == 0 # start in background, check for success
         ? (sleep 1, mock_server_pid()) : 0;
 }