Richard Henderson <[email protected]> writes:
> There are some tests for which SIGTERM appears insufficient. > > Signed-off-by: Richard Henderson <[email protected]> > --- > tests/tcg/Makefile.target | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target > index 14bc013181..a3b0aaf8af 100644 > --- a/tests/tcg/Makefile.target > +++ b/tests/tcg/Makefile.target > @@ -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 I'll queue this directly into testing/next, thanks. Is this to deal with the hanging tests on the s390x box? -- Alex Bennée Virtualisation Tech Lead @ Linaro
