https://github.com/mysterymath created
https://github.com/llvm/llvm-project/pull/93094
Reverts llvm/llvm-project#92572 due to Fuchsia CI breakages (using CLI tools in
tests that weren't necessarily built).
>From daa63e1870999e8ca8db454a788a0720740d194a Mon Sep 17 00:00:00 2001
From: Daniel Thornburgh <mysterym...@gmail.com>
Date: Wed, 22 May 2024 13:54:32 -0700
Subject: [PATCH] Revert "[lldb] Added Debuginfod tests and fixed a couple
issues (#92572)"
This reverts commit e558d21e87882d40e29d858b1269ee8f1ddf2a38.
---
lldb/include/lldb/Host/Config.h.cmake | 2 -
.../Python/lldbsuite/test/decorators.py | 4 -
.../Python/lldbsuite/test/make/Makefile.rules | 26 +--
lldb/source/API/SBDebugger.cpp | 13 +-
.../SymbolFile/DWARF/SymbolFileDWARF.cpp | 38 ++--
.../Plugins/SymbolLocator/CMakeLists.txt | 7 +-
.../SymbolVendor/ELF/SymbolVendorELF.cpp | 29 +--
lldb/test/API/debuginfod/Normal/Makefile | 19 --
.../API/debuginfod/Normal/TestDebuginfod.py | 186 -----------------
lldb/test/API/debuginfod/Normal/main.c | 7 -
lldb/test/API/debuginfod/SplitDWARF/Makefile | 23 --
.../SplitDWARF/TestDebuginfodDWP.py | 196 ------------------
lldb/test/API/debuginfod/SplitDWARF/main.c | 7 -
13 files changed, 22 insertions(+), 535 deletions(-)
delete mode 100644 lldb/test/API/debuginfod/Normal/Makefile
delete mode 100644 lldb/test/API/debuginfod/Normal/TestDebuginfod.py
delete mode 100644 lldb/test/API/debuginfod/Normal/main.c
delete mode 100644 lldb/test/API/debuginfod/SplitDWARF/Makefile
delete mode 100644 lldb/test/API/debuginfod/SplitDWARF/TestDebuginfodDWP.py
delete mode 100644 lldb/test/API/debuginfod/SplitDWARF/main.c
diff --git a/lldb/include/lldb/Host/Config.h.cmake
b/lldb/include/lldb/Host/Config.h.cmake
index 9e538534086a2..3defa454f6d42 100644
--- a/lldb/include/lldb/Host/Config.h.cmake
+++ b/lldb/include/lldb/Host/Config.h.cmake
@@ -33,8 +33,6 @@
#cmakedefine01 LLDB_ENABLE_LZMA
-#cmakedefine01 LLVM_ENABLE_CURL
-
#cmakedefine01 LLDB_ENABLE_CURSES
#cmakedefine01 CURSES_HAVE_NCURSES_CURSES_H
diff --git a/lldb/packages/Python/lldbsuite/test/decorators.py
b/lldb/packages/Python/lldbsuite/test/decorators.py
index b4ac3bdabac86..79cc0a2aeacbe 100644
--- a/lldb/packages/Python/lldbsuite/test/decorators.py
+++ b/lldb/packages/Python/lldbsuite/test/decorators.py
@@ -1055,10 +1055,6 @@ def _get_bool_config_skip_if_decorator(key):
return unittest.skipIf(not have, "requires " + key)
-def skipIfCurlSupportMissing(func):
- return _get_bool_config_skip_if_decorator("curl")(func)
-
-
def skipIfCursesSupportMissing(func):
return _get_bool_config_skip_if_decorator("curses")(func)
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index 2cbc918ebbaeb..bd8eea3d6f5a0 100644
--- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -51,7 +51,7 @@ LLDB_BASE_DIR := $(THIS_FILE_DIR)/../../../../../
#
# GNUWin32 uname gives "windows32" or "server version windows32" while
# some versions of MSYS uname return "MSYS_NT*", but most environments
-# standardize on "Windows_NT", so we'll make it consistent here.
+# standardize on "Windows_NT", so we'll make it consistent here.
# When running tests from Visual Studio, the environment variable isn't
# inherited all the way down to the process spawned for make.
#----------------------------------------------------------------------
@@ -210,12 +210,6 @@ else
ifeq "$(SPLIT_DEBUG_SYMBOLS)" "YES"
DSYM = $(EXE).debug
endif
-
- ifeq "$(MAKE_DWP)" "YES"
- MAKE_DWO := YES
- DWP_NAME = $(EXE).dwp
- DYLIB_DWP_NAME = $(DYLIB_NAME).dwp
- endif
endif
LIMIT_DEBUG_INFO_FLAGS =
@@ -364,7 +358,6 @@ ifneq "$(OS)" "Darwin"
OBJCOPY ?= $(call replace_cc_with,objcopy)
ARCHIVER ?= $(call replace_cc_with,ar)
- DWP ?= $(call replace_cc_with,dwp)
override AR = $(ARCHIVER)
endif
@@ -535,10 +528,6 @@ ifneq "$(CXX)" ""
endif
endif
-ifeq "$(GEN_GNU_BUILD_ID)" "YES"
- LDFLAGS += -Wl,--build-id
-endif
-
#----------------------------------------------------------------------
# DYLIB_ONLY variable can be used to skip the building of a.out.
# See the sections below regarding dSYM file as well as the building of
@@ -577,17 +566,10 @@ else
endif
else
ifeq "$(SPLIT_DEBUG_SYMBOLS)" "YES"
-ifeq "$(SAVE_FULL_DEBUG_BINARY)" "YES"
- cp "$(EXE)" "$(EXE).unstripped"
-endif
$(OBJCOPY) --only-keep-debug "$(EXE)" "$(DSYM)"
$(OBJCOPY) --strip-debug --add-gnu-debuglink="$(DSYM)" "$(EXE)" "$(EXE)"
endif
-ifeq "$(MAKE_DWP)" "YES"
- $(DWP) -o "$(DWP_NAME)" $(DWOS)
endif
-endif
-
#----------------------------------------------------------------------
# Make the dylib
@@ -629,15 +611,9 @@ endif
else
$(LD) $(DYLIB_OBJECTS) $(LDFLAGS) -shared -o "$(DYLIB_FILENAME)"
ifeq "$(SPLIT_DEBUG_SYMBOLS)" "YES"
- ifeq "$(SAVE_FULL_DEBUG_BINARY)" "YES"
- cp "$(DYLIB_FILENAME)" "$(DYLIB_FILENAME).unstripped"
- endif
$(OBJCOPY) --only-keep-debug "$(DYLIB_FILENAME)"
"$(DYLIB_FILENAME).debug"
$(OBJCOPY) --strip-debug --add-gnu-debuglink="$(DYLIB_FILENAME).debug"
"$(DYLIB_FILENAME)" "$(DYLIB_FILENAME)"
endif
-ifeq "$(MAKE_DWP)" "YES"
- $(DWP) -o $(DYLIB_DWP_FILE) $(DYLIB_DWOS)
-endif
endif
#----------------------------------------------------------------------
diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp
index 6e19a6861f378..7ef0d6efd4aaa 100644
--- a/lldb/source/API/SBDebugger.cpp
+++ b/lldb/source/API/SBDebugger.cpp
@@ -775,9 +775,6 @@ SBStructuredData SBDebugger::GetBuildConfiguration() {
AddBoolConfigEntry(
*config_up, "xml", XMLDocument::XMLEnabled(),
"A boolean value that indicates if XML support is enabled in LLDB");
- AddBoolConfigEntry(
- *config_up, "curl", LLVM_ENABLE_CURL,
- "A boolean value that indicates if CURL support is enabled in LLDB");
AddBoolConfigEntry(
*config_up, "curses", LLDB_ENABLE_CURSES,
"A boolean value that indicates if curses support is enabled in LLDB");
@@ -1727,20 +1724,20 @@ SBDebugger::LoadTraceFromFile(SBError &error,
void SBDebugger::RequestInterrupt() {
LLDB_INSTRUMENT_VA(this);
-
+
if (m_opaque_sp)
- m_opaque_sp->RequestInterrupt();
+ m_opaque_sp->RequestInterrupt();
}
void SBDebugger::CancelInterruptRequest() {
LLDB_INSTRUMENT_VA(this);
-
+
if (m_opaque_sp)
- m_opaque_sp->CancelInterruptRequest();
+ m_opaque_sp->CancelInterruptRequest();
}
bool SBDebugger::InterruptRequested() {
LLDB_INSTRUMENT_VA(this);
-
+
if (m_opaque_sp)
return m_opaque_sp->InterruptRequested();
return false;
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index df9704ef61869..f6f152726bf74 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -4381,38 +4381,26 @@ const std::shared_ptr<SymbolFileDWARFDwo>
&SymbolFileDWARF::GetDwpSymbolFile() {
FileSpecList search_paths = Target::GetDefaultDebugFileSearchPaths();
ModuleSpec module_spec;
module_spec.GetFileSpec() = m_objfile_sp->GetFileSpec();
- FileSpec dwp_filespec;
for (const auto &symfile : symfiles.files()) {
module_spec.GetSymbolFileSpec() =
FileSpec(symfile.GetPath() + ".dwp", symfile.GetPathStyle());
LLDB_LOG(log, "Searching for DWP using: \"{0}\"",
module_spec.GetSymbolFileSpec());
- dwp_filespec =
+ FileSpec dwp_filespec =
PluginManager::LocateExecutableSymbolFile(module_spec, search_paths);
if (FileSystem::Instance().Exists(dwp_filespec)) {
- break;
- }
- }
- if (!FileSystem::Instance().Exists(dwp_filespec)) {
- LLDB_LOG(log, "No DWP file found locally");
- // Fill in the UUID for the module we're trying to match for, so we can
- // find the correct DWP file, as the Debuginfod plugin uses *only* this
- // data to correctly match the DWP file with the binary.
- module_spec.GetUUID() = m_objfile_sp->GetUUID();
- dwp_filespec =
- PluginManager::LocateExecutableSymbolFile(module_spec, search_paths);
- }
- if (FileSystem::Instance().Exists(dwp_filespec)) {
- LLDB_LOG(log, "Found DWP file: \"{0}\"", dwp_filespec);
- DataBufferSP dwp_file_data_sp;
- lldb::offset_t dwp_file_data_offset = 0;
- ObjectFileSP dwp_obj_file = ObjectFile::FindPlugin(
- GetObjectFile()->GetModule(), &dwp_filespec, 0,
- FileSystem::Instance().GetByteSize(dwp_filespec), dwp_file_data_sp,
- dwp_file_data_offset);
- if (dwp_obj_file) {
- m_dwp_symfile = std::make_shared<SymbolFileDWARFDwo>(
- *this, dwp_obj_file, DIERef::k_file_index_mask);
+ LLDB_LOG(log, "Found DWP file: \"{0}\"", dwp_filespec);
+ DataBufferSP dwp_file_data_sp;
+ lldb::offset_t dwp_file_data_offset = 0;
+ ObjectFileSP dwp_obj_file = ObjectFile::FindPlugin(
+ GetObjectFile()->GetModule(), &dwp_filespec, 0,
+ FileSystem::Instance().GetByteSize(dwp_filespec), dwp_file_data_sp,
+ dwp_file_data_offset);
+ if (dwp_obj_file) {
+ m_dwp_symfile = std::make_shared<SymbolFileDWARFDwo>(
+ *this, dwp_obj_file, DIERef::k_file_index_mask);
+ break;
+ }
}
}
if (!m_dwp_symfile) {
diff --git a/lldb/source/Plugins/SymbolLocator/CMakeLists.txt
b/lldb/source/Plugins/SymbolLocator/CMakeLists.txt
index 3367022639ab8..ca969626f4ffc 100644
--- a/lldb/source/Plugins/SymbolLocator/CMakeLists.txt
+++ b/lldb/source/Plugins/SymbolLocator/CMakeLists.txt
@@ -1,10 +1,5 @@
-# Order matters here: the first symbol locator prevents further searching.
-# For DWARF binaries that are both stripped and split, the Default plugin
-# will return the stripped binary when asked for the ObjectFile, which then
-# prevents an unstripped binary from being requested from the Debuginfod
-# provider.
-add_subdirectory(Debuginfod)
add_subdirectory(Default)
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
add_subdirectory(DebugSymbols)
endif()
+add_subdirectory(Debuginfod)
diff --git a/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
b/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
index f296e655cc466..b5fe35d71032a 100644
--- a/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
+++ b/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
@@ -44,24 +44,6 @@ llvm::StringRef
SymbolVendorELF::GetPluginDescriptionStatic() {
"executables.";
}
-// If this is needed elsewhere, it can be exported/moved.
-static bool IsDwpSymbolFile(const lldb::ModuleSP &module_sp,
- const FileSpec &file_spec) {
- DataBufferSP dwp_file_data_sp;
- lldb::offset_t dwp_file_data_offset = 0;
- // Try to create an ObjectFile from the file_spec.
- ObjectFileSP dwp_obj_file = ObjectFile::FindPlugin(
- module_sp, &file_spec, 0, FileSystem::Instance().GetByteSize(file_spec),
- dwp_file_data_sp, dwp_file_data_offset);
- // The presence of a debug_cu_index section is the key identifying feature of
- // a DWP file. Make sure we don't fill in the section list on dwp_obj_file
- // (by calling GetSectionList(false)) as this function could be called before
- // we may have all the symbol files collected and available.
- return dwp_obj_file && ObjectFileELF::classof(dwp_obj_file.get()) &&
- dwp_obj_file->GetSectionList(false)->FindSectionByType(
- eSectionTypeDWARFDebugCuIndex, false);
-}
-
// CreateInstance
//
// Platforms can register a callback to use when creating symbol vendors to
@@ -105,15 +87,8 @@ SymbolVendorELF::CreateInstance(const lldb::ModuleSP
&module_sp,
FileSpecList search_paths = Target::GetDefaultDebugFileSearchPaths();
FileSpec dsym_fspec =
PluginManager::LocateExecutableSymbolFile(module_spec, search_paths);
- if (!dsym_fspec || IsDwpSymbolFile(module_sp, dsym_fspec)) {
- // If we have a stripped binary or if we got a DWP file, we should prefer
- // symbols in the executable acquired through a plugin.
- ModuleSpec unstripped_spec =
- PluginManager::LocateExecutableObjectFile(module_spec);
- if (!unstripped_spec)
- return nullptr;
- dsym_fspec = unstripped_spec.GetFileSpec();
- }
+ if (!dsym_fspec)
+ return nullptr;
DataBufferSP dsym_file_data_sp;
lldb::offset_t dsym_file_data_offset = 0;
diff --git a/lldb/test/API/debuginfod/Normal/Makefile
b/lldb/test/API/debuginfod/Normal/Makefile
deleted file mode 100644
index 54bd7adae241f..0000000000000
--- a/lldb/test/API/debuginfod/Normal/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-C_SOURCES := main.c
-
-# For normal (non DWP) Debuginfod tests, we need:
-
-# * The full binary: a.out.unstripped
-# Produced by Makefile.rules with SAVE_FULL_DEBUG_BINARY set to YES and
-# SPLIT_DEBUG_SYMBOLS set to YES
-
-# * The stripped binary (a.out)
-# Produced by Makefile.rules with SPLIT_DEBUG_SYMBOLS set to YES
-
-# * The 'only-keep-debug' binary (a.out.debug)
-# Produced below
-
-SPLIT_DEBUG_SYMBOLS := YES
-SAVE_FULL_DEBUG_BINARY := YES
-GEN_GNU_BUILD_ID := YES
-
-include Makefile.rules
diff --git a/lldb/test/API/debuginfod/Normal/TestDebuginfod.py
b/lldb/test/API/debuginfod/Normal/TestDebuginfod.py
deleted file mode 100644
index 1860c56ef3e99..0000000000000
--- a/lldb/test/API/debuginfod/Normal/TestDebuginfod.py
+++ /dev/null
@@ -1,186 +0,0 @@
-import os
-import shutil
-import tempfile
-
-import lldb
-from lldbsuite.test.decorators import *
-import lldbsuite.test.lldbutil as lldbutil
-from lldbsuite.test.lldbtest import *
-
-
-"""
-Test support for the DebugInfoD network symbol acquisition protocol.
-This one is for simple / no split-dwarf scenarios.
-
-For no-split-dwarf scenarios, there are 2 variations:
-1 - A stripped binary with it's corresponding unstripped binary:
-2 - A stripped binary with a corresponding --only-keep-debug symbols file
-"""
-
-
-class DebugInfodTests(TestBase):
- # No need to try every flavor of debug inf.
- NO_DEBUG_INFO_TESTCASE = True
-
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_normal_no_symbols(self):
- """
- Validate behavior with no symbols or symbol locator.
- ('baseline negative' behavior)
- """
- test_root = self.config_test(["a.out"])
- self.try_breakpoint(False)
-
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_normal_default(self):
- """
- Validate behavior with symbols, but no symbol locator.
- ('baseline positive' behavior)
- """
- test_root = self.config_test(["a.out", "a.out.debug"])
- self.try_breakpoint(True)
-
- @skipIfCurlSupportMissing
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_debuginfod_symbols(self):
- """
- Test behavior with the full binary available from Debuginfod as
- 'debuginfo' from the plug-in.
- """
- test_root = self.config_test(["a.out"], "a.out.unstripped")
- self.try_breakpoint(True)
-
- @skipIfCurlSupportMissing
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_debuginfod_executable(self):
- """
- Test behavior with the full binary available from Debuginfod as
- 'executable' from the plug-in.
- """
- test_root = self.config_test(["a.out"], None, "a.out.unstripped")
- self.try_breakpoint(True)
-
- @skipIfCurlSupportMissing
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_debuginfod_okd_symbols(self):
- """
- Test behavior with the 'only-keep-debug' symbols available from
Debuginfod.
- """
- test_root = self.config_test(["a.out"], "a.out.debug")
- self.try_breakpoint(True)
-
- def try_breakpoint(self, should_have_loc):
- """
- This function creates a target from self.aout, sets a function-name
- breakpoint, and checks to see if we have a file/line location,
- as a way to validate that the symbols have been loaded.
- should_have_loc specifies if we're testing that symbols have or
- haven't been loaded.
- """
- target = self.dbg.CreateTarget(self.aout)
- self.assertTrue(target and target.IsValid(), "Target is valid")
-
- bp = target.BreakpointCreateByName("func")
- self.assertTrue(bp and bp.IsValid(), "Breakpoint is valid")
- self.assertEqual(bp.GetNumLocations(), 1)
-
- loc = bp.GetLocationAtIndex(0)
- self.assertTrue(loc and loc.IsValid(), "Location is valid")
- addr = loc.GetAddress()
- self.assertTrue(addr and addr.IsValid(), "Loc address is valid")
- line_entry = addr.GetLineEntry()
- self.assertEqual(
- should_have_loc,
- line_entry != None and line_entry.IsValid(),
- "Loc line entry is valid",
- )
- if should_have_loc:
- self.assertEqual(line_entry.GetLine(), 4)
- self.assertEqual(
- line_entry.GetFileSpec().GetFilename(),
- self.main_source_file.GetFilename(),
- )
- self.dbg.DeleteTarget(target)
- shutil.rmtree(self.tmp_dir)
-
- def config_test(self, local_files, debuginfo=None, executable=None):
- """
- Set up a test with local_files[] copied to a different location
- so that we control which files are, or are not, found in the file
system.
- Also, create a stand-alone file-system 'hosted' debuginfod server with
the
- provided debuginfo and executable files (if they exist)
-
- Make the filesystem look like:
-
- /tmp/<tmpdir>/test/[local_files]
-
- /tmp/<tmpdir>/cache (for lldb to use as a temp cache)
-
- /tmp/<tmpdir>/buildid/<uuid>/executable -> <executable>
- /tmp/<tmpdir>/buildid/<uuid>/debuginfo -> <debuginfo>
- Returns the /tmp/<tmpdir> path
- """
-
- self.build()
-
- uuid = self.getUUID("a.out")
- if not uuid:
- self.fail("Could not get UUID for a.out")
- return
- self.main_source_file = lldb.SBFileSpec("main.c")
- self.tmp_dir = tempfile.mkdtemp()
- test_dir = os.path.join(self.tmp_dir, "test")
- os.makedirs(test_dir)
-
- self.aout = ""
- # Copy the files used by the test:
- for f in local_files:
- shutil.copy(self.getBuildArtifact(f), test_dir)
- # The first item is the binary to be used for the test
- if self.aout == "":
- self.aout = os.path.join(test_dir, f)
-
- use_debuginfod = debuginfo != None or executable != None
-
- # Populated the 'file://... mocked' Debuginfod server:
- if use_debuginfod:
- os.makedirs(os.path.join(self.tmp_dir, "cache"))
- uuid_dir = os.path.join(self.tmp_dir, "buildid", uuid)
- os.makedirs(uuid_dir)
- if debuginfo:
- shutil.copy(
- self.getBuildArtifact(debuginfo),
- os.path.join(uuid_dir, "debuginfo"),
- )
- if executable:
- shutil.copy(
- self.getBuildArtifact(executable),
- os.path.join(uuid_dir, "executable"),
- )
-
- # Configure LLDB for the test:
- self.runCmd(
- "settings set symbols.enable-external-lookup %s"
- % str(use_debuginfod).lower()
- )
- self.runCmd("settings clear
plugin.symbol-locator.debuginfod.server-urls")
- if use_debuginfod:
- self.runCmd(
- "settings set plugin.symbol-locator.debuginfod.cache-path
%s/cache"
- % self.tmp_dir
- )
- self.runCmd(
- "settings insert-before
plugin.symbol-locator.debuginfod.server-urls 0 file://%s"
- % self.tmp_dir
- )
-
- def getUUID(self, filename):
- try:
- spec = lldb.SBModuleSpec()
- spec.SetFileSpec(lldb.SBFileSpec(self.getBuildArtifact(filename)))
- module = lldb.SBModule(spec)
- uuid = module.GetUUIDString().replace("-", "").lower()
- # Don't want lldb's fake 32 bit CRC's for this one
- return uuid if len(uuid) > 8 else None
- except:
- return None
diff --git a/lldb/test/API/debuginfod/Normal/main.c
b/lldb/test/API/debuginfod/Normal/main.c
deleted file mode 100644
index 4c7184609b453..0000000000000
--- a/lldb/test/API/debuginfod/Normal/main.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// This is a dump little pair of test files
-
-int func(int argc, const char *argv[]) {
- return (argc + 1) * (argv[argc][0] + 2);
-}
-
-int main(int argc, const char *argv[]) { return func(0, argv); }
diff --git a/lldb/test/API/debuginfod/SplitDWARF/Makefile
b/lldb/test/API/debuginfod/SplitDWARF/Makefile
deleted file mode 100644
index 3ab9a969e5a44..0000000000000
--- a/lldb/test/API/debuginfod/SplitDWARF/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-C_SOURCES := main.c
-
-# For split-dwarf Debuginfod tests, we need:
-
-# * A .DWP file (a.out.dwp)
-# Produced by Makefile.rules with MAKE_DWP set to YES
-
-# * The "full" binary (missing things that live in .dwo's) (a.out.unstripped)
-# Produced by Makefile.rules with SAVE_FULL_DEBUG_BINARY set to YES and
-# SPLIT_DEBUG_SYMBOLS set to YES
-
-# * The stripped binary (a.out)
-# Produced by Makefile.rules
-
-# * The 'only-keep-debug' binary (a.out.debug)
-# Produced below
-
-MAKE_DWP := YES
-SPLIT_DEBUG_SYMBOLS := YES
-SAVE_FULL_DEBUG_BINARY := YES
-GEN_GNU_BUILD_ID := YES
-
-include Makefile.rules
diff --git a/lldb/test/API/debuginfod/SplitDWARF/TestDebuginfodDWP.py
b/lldb/test/API/debuginfod/SplitDWARF/TestDebuginfodDWP.py
deleted file mode 100644
index f7d91c45b0afb..0000000000000
--- a/lldb/test/API/debuginfod/SplitDWARF/TestDebuginfodDWP.py
+++ /dev/null
@@ -1,196 +0,0 @@
-"""
-Test support for the DebugInfoD network symbol acquisition protocol.
-"""
-import os
-import shutil
-import tempfile
-
-import lldb
-from lldbsuite.test.decorators import *
-import lldbsuite.test.lldbutil as lldbutil
-from lldbsuite.test.lldbtest import *
-
-
-"""
-Test support for the DebugInfoD network symbol acquisition protocol.
-This file is for split-dwarf (dwp) scenarios.
-
-1 - A split binary target with it's corresponding DWP file
-2 - A stripped, split binary target with an unstripped binary and a DWP file
-3 - A stripped, split binary target with an --only-keep-debug symbols file and
a DWP file
-"""
-
-
-class DebugInfodDWPTests(TestBase):
- # No need to try every flavor of debug inf.
- NO_DEBUG_INFO_TESTCASE = True
-
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_normal_stripped(self):
- """
- Validate behavior with a stripped binary, no symbols or symbol locator.
- """
- self.config_test(["a.out"])
- self.try_breakpoint(False)
-
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_normal_stripped_split_with_dwp(self):
- """
- Validate behavior with symbols, but no symbol locator.
- """
- self.config_test(["a.out", "a.out.debug", "a.out.dwp"])
- self.try_breakpoint(True)
-
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_normal_stripped_only_dwp(self):
- """
- Validate behavior *with* dwp symbols only, but missing other symbols,
- but no symbol locator. This shouldn't work: without the other symbols
- DWO's appear mostly useless.
- """
- self.config_test(["a.out", "a.out.dwp"])
- self.try_breakpoint(False)
-
- @skipIfCurlSupportMissing
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_debuginfod_dwp_from_service(self):
- """
- Test behavior with the unstripped binary, and DWP from the service.
- """
- self.config_test(["a.out.debug"], "a.out.dwp")
- self.try_breakpoint(True)
-
- @skipIfCurlSupportMissing
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_debuginfod_both_symfiles_from_service(self):
- """
- Test behavior with a stripped binary, with the unstripped binary and
- dwp symbols from Debuginfod.
- """
- self.config_test(["a.out"], "a.out.dwp", "a.out.unstripped")
- self.try_breakpoint(True)
-
- @skipIfCurlSupportMissing
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_debuginfod_both_okd_symfiles_from_service(self):
- """
- Test behavior with both the only-keep-debug symbols and the dwp symbols
- from Debuginfod.
- """
- self.config_test(["a.out"], "a.out.dwp", "a.out.debug")
- self.try_breakpoint(True)
-
- def try_breakpoint(self, should_have_loc):
- """
- This function creates a target from self.aout, sets a function-name
- breakpoint, and checks to see if we have a file/line location,
- as a way to validate that the symbols have been loaded.
- should_have_loc specifies if we're testing that symbols have or
- haven't been loaded.
- """
- target = self.dbg.CreateTarget(self.aout)
- self.assertTrue(target and target.IsValid(), "Target is valid")
-
- bp = target.BreakpointCreateByName("func")
- self.assertTrue(bp and bp.IsValid(), "Breakpoint is valid")
- self.assertEqual(bp.GetNumLocations(), 1)
-
- loc = bp.GetLocationAtIndex(0)
- self.assertTrue(loc and loc.IsValid(), "Location is valid")
- addr = loc.GetAddress()
- self.assertTrue(addr and addr.IsValid(), "Loc address is valid")
- line_entry = addr.GetLineEntry()
- self.assertEqual(
- should_have_loc,
- line_entry != None and line_entry.IsValid(),
- "Loc line entry is valid",
- )
- if should_have_loc:
- self.assertEqual(line_entry.GetLine(), 4)
- self.assertEqual(
- line_entry.GetFileSpec().GetFilename(),
- self.main_source_file.GetFilename(),
- )
- self.dbg.DeleteTarget(target)
- shutil.rmtree(self.tmp_dir)
-
- def config_test(self, local_files, debuginfo=None, executable=None):
- """
- Set up a test with local_files[] copied to a different location
- so that we control which files are, or are not, found in the file
system.
- Also, create a stand-alone file-system 'hosted' debuginfod server with
the
- provided debuginfo and executable files (if they exist)
-
- Make the filesystem look like:
-
- /tmp/<tmpdir>/test/[local_files]
-
- /tmp/<tmpdir>/cache (for lldb to use as a temp cache)
-
- /tmp/<tmpdir>/buildid/<uuid>/executable -> <executable>
- /tmp/<tmpdir>/buildid/<uuid>/debuginfo -> <debuginfo>
- Returns the /tmp/<tmpdir> path
- """
-
- self.build()
-
- uuid = self.getUUID("a.out")
- if not uuid:
- self.fail("Could not get UUID for a.out")
- return
- self.main_source_file = lldb.SBFileSpec("main.c")
- self.tmp_dir = tempfile.mkdtemp()
- self.test_dir = os.path.join(self.tmp_dir, "test")
- os.makedirs(self.test_dir)
-
- self.aout = ""
- # Copy the files used by the test:
- for f in local_files:
- shutil.copy(self.getBuildArtifact(f), self.test_dir)
- if self.aout == "":
- self.aout = os.path.join(self.test_dir, f)
-
- use_debuginfod = debuginfo != None or executable != None
-
- # Populated the 'file://... mocked' Debuginfod server:
- if use_debuginfod:
- os.makedirs(os.path.join(self.tmp_dir, "cache"))
- uuid_dir = os.path.join(self.tmp_dir, "buildid", uuid)
- os.makedirs(uuid_dir)
- if debuginfo:
- shutil.copy(
- self.getBuildArtifact(debuginfo),
- os.path.join(uuid_dir, "debuginfo"),
- )
- if executable:
- shutil.copy(
- self.getBuildArtifact(executable),
- os.path.join(uuid_dir, "executable"),
- )
- os.remove(self.getBuildArtifact("main.dwo"))
- # Configure LLDB for the test:
- self.runCmd(
- "settings set symbols.enable-external-lookup %s"
- % str(use_debuginfod).lower()
- )
- self.runCmd("settings clear
plugin.symbol-locator.debuginfod.server-urls")
- if use_debuginfod:
- self.runCmd(
- "settings set plugin.symbol-locator.debuginfod.cache-path
%s/cache"
- % self.tmp_dir
- )
- self.runCmd(
- "settings insert-before
plugin.symbol-locator.debuginfod.server-urls 0 file://%s"
- % self.tmp_dir
- )
-
- def getUUID(self, filename):
- try:
- spec = lldb.SBModuleSpec()
- spec.SetFileSpec(lldb.SBFileSpec(self.getBuildArtifact(filename)))
- module = lldb.SBModule(spec)
- uuid = module.GetUUIDString().replace("-", "").lower()
- # Don't want lldb's fake 32 bit CRC's for this one
- return uuid if len(uuid) > 8 else None
- except:
- return None
diff --git a/lldb/test/API/debuginfod/SplitDWARF/main.c
b/lldb/test/API/debuginfod/SplitDWARF/main.c
deleted file mode 100644
index 4c7184609b453..0000000000000
--- a/lldb/test/API/debuginfod/SplitDWARF/main.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// This is a dump little pair of test files
-
-int func(int argc, const char *argv[]) {
- return (argc + 1) * (argv[argc][0] + 2);
-}
-
-int main(int argc, const char *argv[]) { return func(0, argv); }
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
