]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
tests/tcg: Use SIGKILL for timeout
authorRichard Henderson <richard.henderson@linaro.org>
Tue, 24 Jan 2023 18:01:08 +0000 (18:01 +0000)
committerAlex Bennée <alex.bennee@linaro.org>
Thu, 2 Feb 2023 10:44:23 +0000 (10:44 +0000)
linux-user blocks all signals while attempting to handle guest
signals (e.g. ABRT), which means that the default TERM sent by timeout
has no effect -- KILL instead.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230117035701.168514-2-richard.henderson@linaro.org>
[AJB: expanded commit message from cover letter]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230124180127.1881110-17-alex.bennee@linaro.org>

tests/tcg/Makefile.target

index 14bc01318164754820cfdf7c53693c6b483946b3..a3b0aaf8af1ff4f0d3a9ec99999267e404e65124 100644 (file)
@@ -54,10 +54,10 @@ cc-option = if $(call cc-test, $1); then \
 
 # $1 = test name, $2 = cmd, $3 = desc
 ifeq ($(filter %-softmmu, $(TARGET)),)
-run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2 > $1.out, \
+run-test = $(call quiet-command, timeout -s KILL --foreground $(TIMEOUT) $2 > $1.out, \
        TEST,$(or $3, $*, $<) on $(TARGET_NAME))
 else
-run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2, \
+run-test = $(call quiet-command, timeout -s KILL --foreground $(TIMEOUT) $2, \
         TEST,$(or $3, $*, $<) on $(TARGET_NAME))
 endif