summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/lit/lit.cfg.py3
-rw-r--r--lldb/lit/lit.site.cfg.py.in1
2 files changed, 3 insertions, 1 deletions
diff --git a/lldb/lit/lit.cfg.py b/lldb/lit/lit.cfg.py
index f96152eedea..8f89a125870 100644
--- a/lldb/lit/lit.cfg.py
+++ b/lldb/lit/lit.cfg.py
@@ -74,6 +74,9 @@ for i in ['module-cache-clang', 'module-cache-lldb']:
print("Deleting module cache at %s."%cachedir)
shutil.rmtree(cachedir)
+# Set a default timeout of 10 minutes.
+lit_config.maxIndividualTestTime = 600
+
# If running tests natively, check for CPU features needed for some tests.
if 'native' in config.available_features:
diff --git a/lldb/lit/lit.site.cfg.py.in b/lldb/lit/lit.site.cfg.py.in
index dfe41ab0ec0..623ff4cd662 100644
--- a/lldb/lit/lit.site.cfg.py.in
+++ b/lldb/lit/lit.site.cfg.py.in
@@ -20,7 +20,6 @@ config.lldb_bitness = 64 if @LLDB_IS_64_BITS@ else 32
config.lldb_disable_python = @LLDB_DISABLE_PYTHON@
config.have_lldb_instr = @LLDB_TOOL_LLDB_INSTR_BUILD@
config.have_lldb_vscode = @LLDB_TOOL_LLDB_VSCODE_BUILD@
-config.maxIndividualTestTime = 600
# Support substitution of the tools and libs dirs with user parameters. This is
# used when we can't determine the tool dir at configuration time.
OpenPOWER on IntegriCloud