mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/tcg: Unconditionally use 90 second timeout

Browse Source 
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: 23a77b2d18 ("build-system: clean up TCG/TCI configury")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-12-30 13:54:01 -08:00
parent fd0f79d715
commit 909c476d99
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/tcg/Makefile.target
View File

@ -82,13 +82,12 @@ QEMU_OPTS=
# If TCG debugging, or TCI is enabled things are a lot slower # 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 TIMEOUT=90
else ifneq ($(CONFIG_DEBUG_TCG),)
TIMEOUT=60
else
TIMEOUT=15
endif
ifdef CONFIG_USER_ONLY ifdef CONFIG_USER_ONLY
# The order we include is important. We include multiarch first and # 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 p,$(PLUGINS), \
$(foreach t,$(TESTS),\ $(foreach t,$(TESTS),\
$(eval run-plugin-$(t)-with-$(p): $t $p) \ $(eval run-plugin-$(t)-with-$(p): $t $p) \
$(eval run-plugin-$(t)-with-$(p): TIMEOUT=60) \
$(eval RUN_TESTS+=run-plugin-$(t)-with-$(p)))) $(eval RUN_TESTS+=run-plugin-$(t)-with-$(p))))
endif endif