diff options
| author | Adrian Prantl <aprantl@apple.com> | 2018-08-21 16:13:37 +0000 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2018-08-21 16:13:37 +0000 |
| commit | 95f21584a9b3b1804cc5bf9efbe8b3b597a2ddc1 (patch) | |
| tree | 4be2138a56f2a3371f29833006acb1342d8ab62a /lldb/packages/Python/lldbsuite | |
| parent | b666e73dd9871e675d71109eb0d1f6fc1335e247 (diff) | |
| download | bcm5719-llvm-95f21584a9b3b1804cc5bf9efbe8b3b597a2ddc1.tar.gz bcm5719-llvm-95f21584a9b3b1804cc5bf9efbe8b3b597a2ddc1.zip | |
lldbtest.py: Unconditionally set the clang module cache path.
This should fix the errors observable on the new lldb-cmake bot.
llvm-svn: 340293
Diffstat (limited to 'lldb/packages/Python/lldbsuite')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/lldbtest.py | 21 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py | 3 |
2 files changed, 11 insertions, 13 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index ed9862c6192..e7316af9e89 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -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"]) diff --git a/lldb/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py b/lldb/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py index 59b325f5798..287c1c1b87b 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py +++ b/lldb/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py @@ -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) |
