From c1602cfd61840305f77b94c876f5fbb59aaec542 Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Sun, 28 Jun 2020 21:15:29 +0000 Subject: [PATCH] sh/tests: Fix flaky execution/bg12.0 When job control is not enabled, the shell ignores SIGINT while waiting for a foreground process unless that process exits on SIGINT. In this case, the foreground process is sleep and it does not exit on SIGINT because the signal is only sent to the shell. Depending on order of events, this could cause the SIGINT to be unexpectedly ignored. On lightly loaded bare metal, the chance of this happening tends to be less than 0.01% but with higher loads and/or virtualization it becomes more likely. Starting the sleep in background and using the wait builtin ensures SIGINT will not be ignored. PR: 247559 Reported by: lwhsu MFC after: 1 week --- bin/sh/tests/execution/bg12.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sh/tests/execution/bg12.0 b/bin/sh/tests/execution/bg12.0 index 78102ecf6306..a9bde6cac8a3 100644 --- a/bin/sh/tests/execution/bg12.0 +++ b/bin/sh/tests/execution/bg12.0 @@ -4,7 +4,7 @@ T=`mktemp -d ${TMPDIR:-/tmp}/sh-test.XXXXXXXX` trap 'rm -rf $T' 0 cd $T || exit 3 mkfifo fifo1 -{ trap - INT; : >fifo1; sleep 5; exit 4; } & +{ trap - INT; : >fifo1; sleep 5 & wait; exit 4; } & :