From d2d4110e8e3bbe4894bd9cf6a5c95a8092bdd295 Mon Sep 17 00:00:00 2001 From: Jerry Yu Date: Tue, 26 Jul 2022 17:34:42 +0800 Subject: [PATCH] Remove `Teminated` message from stdout Signed-off-by: Jerry Yu --- tests/ssl-opt.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh index 7a2b58e80..398ce57ce 100755 --- a/tests/ssl-opt.sh +++ b/tests/ssl-opt.sh @@ -874,12 +874,12 @@ wait_client_done() { ( sleep $CLI_DELAY; echo "===CLIENT_TIMEOUT===" >> $CLI_OUT; kill $CLI_PID ) & DOG_PID=$! - wait $CLI_PID + # For Ubuntu 22.04, `Terminated` message is outputed by wait command. + # To remove it from stdout, redirect stdout/stderr to CLI_OUT + wait $CLI_PID >> $CLI_OUT 2>&1 CLI_EXIT=$? kill $DOG_PID >/dev/null 2>&1 - # For Ubuntu 22.04, `Terminated` message is outputed by wait command. - # To remove it from stdout, redirect stdout/stderr to CLI_OUT wait $DOG_PID >> $CLI_OUT 2>&1 echo "EXIT: $CLI_EXIT" >> $CLI_OUT @@ -1230,7 +1230,9 @@ do_run_test_once() { # terminate the server (and the proxy) kill $SRV_PID - wait $SRV_PID + # For Ubuntu 22.04, `Terminated` message is outputed by wait command. + # To remove it from stdout, redirect stdout/stderr to CLI_OUT + wait $SRV_PID >> $SRV_OUT 2>&1 SRV_RET=$? if [ -n "$PXY_CMD" ]; then