From f3ac8712ff9e0f72238f7e898a34597ad16eb3c3 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Mon, 29 Apr 2019 19:55:49 +0000 Subject: [PATCH] [lit] Fix the timeout. The timeout wasn't working because it's a property of the lit configuration, not of the configuration in lit.site.cfg. This sets the property for the correct object. llvm-svn: 359492 --- lldb/lit/lit.cfg.py | 3 +++ lldb/lit/lit.site.cfg.py.in | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lldb/lit/lit.cfg.py b/lldb/lit/lit.cfg.py index f96152e..8f89a12 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 dfe41ab..623ff4c 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. -- 2.7.4