aprantl created this revision.
aprantl added reviewers: jingham, vsk, labath.
This is a more principled approach to disabling Spotlight .dSYM lookups while
running the testsuite, most importantly it also works for the LIT-based tests,
which I overlooked in my initial fix (renaming the test build dir to
lldb-tests.noindex).
https://reviews.llvm.org/D44342
Files:
include/lldb/Core/ModuleList.h
lit/lit-lldb-init
lit/lit.cfg
packages/Python/lldbsuite/test/lldbtest.py
source/Core/ModuleList.cpp
source/Host/macosx/Symbols.cpp
Index: source/Host/macosx/Symbols.cpp
===================================================================
--- source/Host/macosx/Symbols.cpp
+++ source/Host/macosx/Symbols.cpp
@@ -23,6 +23,7 @@
#include "Host/macosx/cfcpp/CFCData.h"
#include "Host/macosx/cfcpp/CFCReleaser.h"
#include "Host/macosx/cfcpp/CFCString.h"
+#include "lldb/Core/ModuleList.h"
#include "lldb/Core/ModuleSpec.h"
#include "lldb/Host/Host.h"
#include "lldb/Symbol/ObjectFile.h"
@@ -54,6 +55,13 @@
int LocateMacOSXFilesUsingDebugSymbols(const ModuleSpec &module_spec,
ModuleSpec &return_module_spec) {
+ Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
+ if (!ModuleList::GetGlobalModuleListProperties().GetSpotlightDsymLookup()) {
+ if (log)
+ log->Printf("Spotlight lookup for .dSYM bundles is disabled.");
+ return 0;
+ }
+
return_module_spec = module_spec;
return_module_spec.GetFileSpec().Clear();
return_module_spec.GetSymbolFileSpec().Clear();
@@ -79,7 +87,6 @@
if (module_uuid_ref.get()) {
CFCReleaser<CFURLRef> exec_url;
const FileSpec *exec_fspec = module_spec.GetFileSpecPtr();
- Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
if (exec_fspec) {
char exec_cf_path[PATH_MAX];
if (exec_fspec->GetPath(exec_cf_path, sizeof(exec_cf_path)))
Index: source/Core/ModuleList.cpp
===================================================================
--- source/Core/ModuleList.cpp
+++ source/Core/ModuleList.cpp
@@ -67,12 +67,23 @@
namespace {
PropertyDefinition g_properties[] = {
+#if defined(__APPLE__)
+ // This option only makes sense when the host is macOS.
+ {"spotlight-dsym-lookup", OptionValue::eTypeBoolean, true, true, nullptr,
+ nullptr,
+ "Use Spotlight to locate a matching .dSYM bundle based on the UUID of the "
+ "executable."},
+#endif
{"clang-modules-cache-path", OptionValue::eTypeFileSpec, true, 0, nullptr,
nullptr,
"The path to the clang modules cache directory (-fmodules-cache-path)."},
{nullptr, OptionValue::eTypeInvalid, false, 0, nullptr, nullptr, nullptr}};
-enum { ePropertyClangModulesCachePath };
+enum {
+#if defined(__APPLE__)
+ ePropertySpotlightDsymLookup,
+#endif
+ ePropertyClangModulesCachePath };
} // namespace
@@ -85,6 +96,14 @@
SetClangModulesCachePath(path);
}
+#if defined(__APPLE__)
+bool ModuleListProperties::GetSpotlightDsymLookup() const {
+ const uint32_t idx = ePropertySpotlightDsymLookup;
+ return m_collection_sp->GetPropertyAtIndexAsBoolean(
+ nullptr, idx, g_properties[idx].default_uint_value != 0);
+}
+#endif
+
FileSpec ModuleListProperties::GetClangModulesCachePath() const {
return m_collection_sp
->GetPropertyAtIndexAsOptionValueFileSpec(nullptr, false,
Index: packages/Python/lldbsuite/test/lldbtest.py
===================================================================
--- packages/Python/lldbsuite/test/lldbtest.py
+++ packages/Python/lldbsuite/test/lldbtest.py
@@ -1917,13 +1917,18 @@
# decorators.
Base.setUp(self)
- # Set the clang modules cache path.
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.spotlight-dsym-lookup false')
+
if "LLDB_MAX_LAUNCH_COUNT" in os.environ:
self.maxLaunchCount = int(os.environ["LLDB_MAX_LAUNCH_COUNT"])
Index: lit/lit.cfg
===================================================================
--- lit/lit.cfg
+++ lit/lit.cfg
@@ -55,7 +55,8 @@
config.substitutions.append(('%python', config.python_executable))
debugserver = lit.util.which('debugserver', lldb_tools_dir)
-lldb = lit.util.which('lldb', lldb_tools_dir)
+lldb = "%s -S %s/lit-lldb-init" % (lit.util.which('lldb', lldb_tools_dir),
+ config.test_source_root)
if not os.path.exists(config.cc):
config.cc = lit.util.which(config.cc, config.environment['PATH'])
Index: lit/lit-lldb-init
===================================================================
--- /dev/null
+++ lit/lit-lldb-init
@@ -0,0 +1,2 @@
+# LLDB init file for the LIT tests.
+settings set symbols.spotlight-dsym-lookup false
\ No newline at end of file
Index: include/lldb/Core/ModuleList.h
===================================================================
--- include/lldb/Core/ModuleList.h
+++ include/lldb/Core/ModuleList.h
@@ -81,6 +81,10 @@
FileSpec GetClangModulesCachePath() const;
bool SetClangModulesCachePath(llvm::StringRef path);
+#if defined(__APPLE__)
+ // This setting only makes sense on a macOS host.
+ bool GetSpotlightDsymLookup() const;
+#endif
};
//----------------------------------------------------------------------
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
