mirror of
https://github.com/cuberite/polarssl.git
synced 2025-09-10 23:55:35 -04:00
Merge pull request #5893 from AndrzejKurek/ssl-opt-client-kill-fix-2.28
[Backport 2.28] Fix a bug with executing ssl-client2 in ssl-opt.sh in a subshell
This commit is contained in:
commit
7e163d796c
@ -1140,7 +1140,11 @@ do_run_test_once() {
|
|||||||
wait_server_start "$SRV_PORT" "$SRV_PID"
|
wait_server_start "$SRV_PORT" "$SRV_PID"
|
||||||
|
|
||||||
printf '# %s\n%s\n' "$NAME" "$CLI_CMD" > $CLI_OUT
|
printf '# %s\n%s\n' "$NAME" "$CLI_CMD" > $CLI_OUT
|
||||||
eval "$CLI_CMD" >> $CLI_OUT 2>&1 &
|
# The client must be a subprocess of the script in order for killing it to
|
||||||
|
# work properly, that's why the ampersand is placed inside the eval command,
|
||||||
|
# not at the end of the line: the latter approach will spawn eval as a
|
||||||
|
# subprocess, and the $CLI_CMD as a grandchild.
|
||||||
|
eval "$CLI_CMD &" >> $CLI_OUT 2>&1
|
||||||
wait_client_done
|
wait_client_done
|
||||||
|
|
||||||
sleep 0.05
|
sleep 0.05
|
||||||
|
Loading…
x
Reference in New Issue
Block a user