aprantl created this revision.
aprantl added reviewers: JDevlieghere, davide, jingham, vsk.
aprantl added a dependency: D54601: Makefile.rules: Use a shared clang module
cache directory..
This saves about 3 redundant gigabytes from the Objective-C test build
directories. Tests that must do unsavory things with the LLDB clang
module cache, already specify a per-test module cache in their .py
test instructions.
rdar://problem/36002081
https://reviews.llvm.org/D54602
Files:
lit/lit.cfg.py
packages/Python/lldbsuite/test/lldbtest.py
Index: packages/Python/lldbsuite/test/lldbtest.py
===================================================================
--- packages/Python/lldbsuite/test/lldbtest.py
+++ packages/Python/lldbsuite/test/lldbtest.py
@@ -1862,8 +1862,9 @@
# 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)
Index: lit/lit.cfg.py
===================================================================
--- lit/lit.cfg.py
+++ lit/lit.cfg.py
@@ -128,7 +128,7 @@
# 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)
Index: packages/Python/lldbsuite/test/lldbtest.py
===================================================================
--- packages/Python/lldbsuite/test/lldbtest.py
+++ packages/Python/lldbsuite/test/lldbtest.py
@@ -1862,8 +1862,9 @@
# 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)
Index: lit/lit.cfg.py
===================================================================
--- lit/lit.cfg.py
+++ lit/lit.cfg.py
@@ -128,7 +128,7 @@
# 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)
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
