From a333ce52b178138f8972b5f67c30fe03f19eed49 Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Mon, 23 Feb 2026 21:10:09 -0700 Subject: [PATCH] Increase jlibtool test timeout to 600s under sanitizers The O2-g3 sanitizer build was hitting the 300s jlibtool timeout on unit_test_module tests (e.g. modules/files/vendor). Double the timeout when sanitizers are enabled to account for ASAN overhead. --- Make.inc.in | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Make.inc.in b/Make.inc.in index 722ab9d4ca6..166d5f4edd2 100644 --- a/Make.inc.in +++ b/Make.inc.in @@ -201,12 +201,18 @@ ANALYZE.c := @clang_path@ # # Have wrappers for the test tools, so that they run. # -# We have a hardcoded maximum execution time of 300 seconds -# If your test takes > 300 seconds to run, you're doing -# something wrong. +# We have a default maximum execution time of 300 seconds. +# When running under sanitizers, allow 600 seconds due to +# the additional overhead. # +ifneq "$(findstring sanitize,$(CFLAGS))" "" +TEST_TIMEOUT := 600 +else +TEST_TIMEOUT := 300 +endif + TEST_BIN_DIR = ./$(BUILD_DIR)/bin/local -TEST_BIN = $(JLIBTOOL) $(if ${VERBOSE},--debug,--silent) --timeout=300 --mode=execute $(TEST_BIN_DIR) +TEST_BIN = $(JLIBTOOL) $(if ${VERBOSE},--debug,--silent) --timeout=$(TEST_TIMEOUT) --mode=execute $(TEST_BIN_DIR) TEST_BIN_NO_TIMEOUT = $(JLIBTOOL) $(if ${VERBOSE},--debug,--silent) --mode=execute $(TEST_BIN_DIR) # -- 2.47.3