aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--tools/run_tests/configs.json2
-rwxr-xr-xtools/run_tests/run_tests_matrix.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/run_tests/configs.json b/tools/run_tests/configs.json
index a7cc376c2d..b0839ef026 100644
--- a/tools/run_tests/configs.json
+++ b/tools/run_tests/configs.json
@@ -66,7 +66,7 @@
"environ": {
"TSAN_OPTIONS": "suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1"
},
- "timeout_multiplier": 8
+ "timeout_multiplier": 5
},
{
"config": "stapprof"
diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py
index f9313614b9..e4c51b8c03 100755
--- a/tools/run_tests/run_tests_matrix.py
+++ b/tools/run_tests/run_tests_matrix.py
@@ -42,7 +42,7 @@ os.chdir(_ROOT)
# Set the timeout high to allow enough time for sanitizers and pre-building
# clang docker.
-_RUNTESTS_TIMEOUT = 3*60*60
+_RUNTESTS_TIMEOUT = 4*60*60
# Number of jobs assigned to each run_tests.py instance
_INNER_JOBS = 2