Author: adrian
Date: Tue Aug 21 09:13:37 2018
New Revision: 340293
URL: http://llvm.org/viewvc/llvm-project?rev=340293&view=rev
Log:
lldbtest.py: Unconditionally set the clang module cache path.
This should fix the errors observable on the new lldb-cmake bot.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
lldb/trunk/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py
Modified: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py?rev=340293&r1=340292&r2=340293&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py Tue Aug 21 09:13:37
2018
@@ -1880,18 +1880,15 @@ class TestBase(Base):
# decorators.
Base.setUp(self)
- if self.child:
- # Set the clang modules cache path.
- assert(self.getDebugInfo() == 'default')
- mod_cache = os.path.join(self.getBuildDir(), "module-cache")
- self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
- % mod_cache)
-
- # Disable Spotlight lookup. The testsuite creates
- # different binaries with the same UUID, because they only
- # differ in the debug info, which is not being hashed.
- self.runCmd('settings set symbols.enable-external-lookup false')
+ # Set the clang modules cache path.
+ mod_cache = os.path.join(self.getBuildDir(), "module-cache-lldb")
+ self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
+ % mod_cache)
+ # Disable Spotlight lookup. The testsuite creates
+ # different binaries with the same UUID, because they only
+ # differ in the debug info, which is not being hashed.
+ self.runCmd('settings set symbols.enable-external-lookup false')
if "LLDB_MAX_LAUNCH_COUNT" in os.environ:
self.maxLaunchCount = int(os.environ["LLDB_MAX_LAUNCH_COUNT"])
Modified:
lldb/trunk/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py?rev=340293&r1=340292&r2=340293&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py
Tue Aug 21 09:13:37 2018
@@ -95,7 +95,8 @@ class DarwinNSLogOutputTestCase(TestBase
self.expect(re.compile(r"stop reason = breakpoint"))
def runCmd(self, cmd):
- self.child.sendline(cmd)
+ if self.child:
+ self.child.sendline(cmd)
def expect_prompt(self, exactly=True):
self.expect(self.child_prompt, exactly=exactly)
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
