diff options
Diffstat (limited to 'lldb')
| -rw-r--r-- | lldb/lit/lit.cfg.py | 2 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/lldbtest.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lldb/lit/lit.cfg.py b/lldb/lit/lit.cfg.py index 86cc9022101..8fd34da1caa 100644 --- a/lldb/lit/lit.cfg.py +++ b/lldb/lit/lit.cfg.py @@ -128,7 +128,7 @@ llvm_config.feature_config( # Clean the module caches in the test build directory. This is # necessary in an incremental build whenever clang changes underneath, # so doing it once per lit.py invocation is close enough. -for i in ['module-cache-clang']: +for i in ['module-cache-clang', 'module-cache-lldb']: cachedir = os.path.join(config.llvm_obj_root, 'lldb-test-build.noindex', i) if os.path.isdir(cachedir): print("Deleting module cache at %s."%cachedir) diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index 9b1aefffdf2..0606dce43a9 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -1862,8 +1862,9 @@ class TestBase(Base): # decorators. Base.setUp(self) - # Set the clang modules cache path. - mod_cache = os.path.join(self.getBuildDir(), "module-cache-lldb") + # Set the clang modules cache path used by LLDB. + mod_cache = os.path.join(os.path.join(os.environ["LLDB_BUILD"], + "module-cache-lldb")) self.runCmd('settings set symbols.clang-modules-cache-path "%s"' % mod_cache) |
