[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] tests/tcg: Unconditionally use 90 second timeout
From: |
Richard Henderson |
Subject: |
[PATCH] tests/tcg: Unconditionally use 90 second timeout |
Date: |
Thu, 30 Dec 2021 15:54:24 -0800 |
The cross-i386-tci test has timeouts because we're no longer
actually applying the timeout that we desired. Hack around it.
Fixes: 23a77b2d18b8 ("build-system: clean up TCG/TCI configury")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tests/tcg/Makefile.target | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
---
This fixes the persistant timeouts that we've been seeing in
gitlab for the cross-i386-tci target.
---
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
--
2.25.1
- [PATCH] tests/tcg: Unconditionally use 90 second timeout,
Richard Henderson <=