diff options
| -rw-r--r-- | lldb/test/API/lit.cfg | 9 | ||||
| -rw-r--r-- | lldb/test/Shell/lit.cfg.py | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lldb/test/API/lit.cfg b/lldb/test/API/lit.cfg index 26286ed5c50..f29d9047e24 100644 --- a/lldb/test/API/lit.cfg +++ b/lldb/test/API/lit.cfg @@ -61,6 +61,15 @@ for cachedir in [config.clang_module_cache, config.lldb_module_cache]: print("Deleting module cache at %s."%cachedir) shutil.rmtree(cachedir) +# Set a default per-test timeout of 10 minutes. Setting a timeout per test +# requires that killProcessAndChildren() is supported on the platform and +# lit complains if the value is set but it is not supported. +supported, errormsg = lit_config.maxIndividualTestTimeIsSupported +if supported: + lit_config.maxIndividualTestTime = 600 +else: + lit_config.warning("Could not set a default per-test timeout. " + errormsg) + # Build dotest command. dotest_cmd = [config.dotest_path] dotest_cmd.extend(config.dotest_args_str.split(';')) diff --git a/lldb/test/Shell/lit.cfg.py b/lldb/test/Shell/lit.cfg.py index 6f0ca673237..cc54234faf7 100644 --- a/lldb/test/Shell/lit.cfg.py +++ b/lldb/test/Shell/lit.cfg.py @@ -39,9 +39,7 @@ config.test_exec_root = os.path.join(config.lldb_obj_root, 'test') llvm_config.use_default_substitutions() - toolchain.use_lldb_substitutions(config) - toolchain.use_support_substitutions(config) |
