From 8c82c41262fad55de7ed921b9e0df0da6c0e896b Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 17 Jun 2019 14:46:17 +0000 Subject: [lldb] [test] Extend D55859 symbols.enable-external-lookup=false for more testcases D55859 has no effect for some of the testcases so this patch extends it even for (all?) other testcases known to me. LLDB was failing when LLDB prints errors reading system debug infos (`*-debuginfo.rpm`, DWZ-optimized) which should never happen as LLDB testcases should not be affected by system debug infos. `lldb/packages/Python/lldbsuite/test/api/multithreaded/driver.cpp.template` is using only SB API which does not expose `ModuleList` so I had to call `HandleCommand()` there. `lldb-test.cpp` could also use `HandleCommand` and then there would be no need for `ModuleListProperties::SetEnableExternalLookup()` but I think it is cleaner with API and not on based on text commands. Differential Revision: https://reviews.llvm.org/D63339 llvm-svn: 363567 --- .../Python/lldbsuite/test/api/multithreaded/driver.cpp.template | 1 + lldb/packages/Python/lldbsuite/test/lldbtest.py | 8 ++++---- lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py | 8 ++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'lldb/packages/Python') diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/driver.cpp.template b/lldb/packages/Python/lldbsuite/test/api/multithreaded/driver.cpp.template index f4bd021632c..ebe7b8c8e17 100644 --- a/lldb/packages/Python/lldbsuite/test/api/multithreaded/driver.cpp.template +++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/driver.cpp.template @@ -31,6 +31,7 @@ int main(int argc, char** argv) { SBDebugger::Initialize(); SBDebugger dbg = SBDebugger::Create(); + dbg.HandleCommand("settings set symbols.enable-external-lookup false"); try { if (!dbg.IsValid()) diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index 90588a6e6b7..3064a6c2d85 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -729,12 +729,12 @@ class Base(unittest2.TestCase): else: self.lldbVSCodeExec = None + self.lldbOption = "-o 'settings set symbols.enable-external-lookup false'" + # If we spawn an lldb process for test (via pexpect), do not load the # init file unless told otherwise. - if "NO_LLDBINIT" in os.environ and "NO" == os.environ["NO_LLDBINIT"]: - self.lldbOption = "" - else: - self.lldbOption = "--no-lldbinit" + if os.environ.get("NO_LLDBINIT") != "NO": + self.lldbOption += " --no-lldbinit" # Assign the test method name to self.testMethodName. # diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py index 4e09e6a43a4..74ee4a6c44c 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py @@ -447,8 +447,10 @@ class DebugCommunication(object): args_dict['waitFor'] = waitFor if trace: args_dict['trace'] = trace + args_dict['initCommands'] = [ + 'settings set symbols.enable-external-lookup false'] if initCommands: - args_dict['initCommands'] = initCommands + args_dict['initCommands'].extend(initCommands) if preRunCommands: args_dict['preRunCommands'] = preRunCommands if stopCommands: @@ -582,8 +584,10 @@ class DebugCommunication(object): args_dict['shellExpandArguments'] = shellExpandArguments if trace: args_dict['trace'] = trace + args_dict['initCommands'] = [ + 'settings set symbols.enable-external-lookup false'] if initCommands: - args_dict['initCommands'] = initCommands + args_dict['initCommands'].extend(initCommands) if preRunCommands: args_dict['preRunCommands'] = preRunCommands if stopCommands: -- cgit v1.2.3