aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Edlinger <bernd.edlinger@hotmail.de>2022-05-24 18:48:02 +0200
committerBernd Edlinger <bernd.edlinger@hotmail.de>2022-05-28 17:02:55 +0200
commit128d1c3c0a12fe68175a460e06daf1e0d940f681 (patch)
treefa57cb5c9b313352a20b29b2fda09593e17fe638
parenteec204f4b19f86e726aa09c5c919a57bdf2ee1d0 (diff)
downloadopenssl-128d1c3c0a12fe68175a460e06daf1e0d940f681.tar.gz
Fix visual glitch in non-verbose test output
This fixes a glitch in the non-verbose test output $ make test [...] 80-test_ciphername.t .... ok 80-test_cmp_http.t ...... 5/? 80-test_cmp_http.t ...... ok 611 80-test_cms.t ........... ok 80-test_cmsapi.t ........ ok Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18401)
-rw-r--r--test/recipes/80-test_cmp_http.t4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/recipes/80-test_cmp_http.t b/test/recipes/80-test_cmp_http.t
index 75acc07a4c..02ec2bb9a4 100644
--- a/test/recipes/80-test_cmp_http.t
+++ b/test/recipes/80-test_cmp_http.t
@@ -170,7 +170,7 @@ sub test_cmp_http_aspect {
# from $BLDTOP/test-runs/test_cmp_http and prepending the input files by SRCTOP.
indir data_dir() => sub {
- plan tests => @server_configurations * @all_aspects
+ plan tests => 1 + @server_configurations * @all_aspects
+ (grep(/^Mock$/, @server_configurations)
&& grep(/^certstatus$/, @all_aspects));
@@ -196,6 +196,7 @@ indir data_dir() => sub {
};
};
stop_mock_server($pid) if $pid;
+ ok(1, "killing mock server");
}
}
};
@@ -294,4 +295,5 @@ sub stop_mock_server {
my $pid = $_[0];
print "Killing mock server with pid=$pid\n";
kill('KILL', $pid);
+ waitpid($pid, 0);
}