diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-12-30 13:54:01 -0800 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-12-30 21:40:27 -0800 |
| commit | 909c476d991185720a15c36fa7fe9159ccb06ab2 (patch) | |
| tree | 97a59d7f1b0b3bf3cfac81787bffdb63caa9baad | |
| parent | fd0f79d715420eb3eac1de738983046cefc5df7d (diff) | |
| download | focaccia-qemu-909c476d991185720a15c36fa7fe9159ccb06ab2.tar.gz focaccia-qemu-909c476d991185720a15c36fa7fe9159ccb06ab2.zip | |
tests/tcg: Unconditionally use 90 second timeout
The cross-i386-tci test has timeouts because we're no longer
applying the timeout that we desired. Hack around it.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Fixes: 23a77b2d18b8 ("build-system: clean up TCG/TCI configury")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | tests/tcg/Makefile.target | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 63cf1b2573..0f8645f782 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -82,13 +82,12 @@ QEMU_OPTS= # If TCG debugging, or TCI is enabled things are a lot slower -ifneq ($(CONFIG_TCG_INTERPRETER),) +# ??? Makefile no longer has any indication that TCI is enabled, +# but for the record: +# 15s original default +# 60s with --enable-debug +# 90s with --enable-tcg-interpreter TIMEOUT=90 -else ifneq ($(CONFIG_DEBUG_TCG),) -TIMEOUT=60 -else -TIMEOUT=15 -endif ifdef CONFIG_USER_ONLY # The order we include is important. We include multiarch first and @@ -144,7 +143,6 @@ PLUGINS=$(patsubst %.c, lib%.so, $(notdir $(wildcard $(PLUGIN_SRC)/*.c))) $(foreach p,$(PLUGINS), \ $(foreach t,$(TESTS),\ $(eval run-plugin-$(t)-with-$(p): $t $p) \ - $(eval run-plugin-$(t)-with-$(p): TIMEOUT=60) \ $(eval RUN_TESTS+=run-plugin-$(t)-with-$(p)))) endif |