Updated to respond to (very late) code review feedback

Author: Kevin Frei

lldb/packages/Python/lldbsuite/test/decorators.py

@@ -1053,6 +1053,10 @@ 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)
 

lldb/source/API/SBDebugger.cpp

@@ -775,6 +775,9 @@ 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");
@@ -1724,20 +1727,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;

lldb/test/API/debuginfod/Normal/TestDebuginfod.py

@@ -22,11 +22,11 @@ class DebugInfodTests(TestBase):
     # No need to try every flavor of debug inf.
     NO_DEBUG_INFO_TESTCASE = True
 
-    def setUp(self):
-        TestBase.setUp(self)
-        # Don't run these tests if we don't have Debuginfod support
-        if "Debuginfod" not in configuration.enabled_plugins:
-            self.skipTest("The Debuginfod SymbolLocator plugin is not enabled")
+    # def setUp(self):
+    #     TestBase.setUp(self)
+    #     # Don't run these tests if we don't have Debuginfod support
+    #     if "Debuginfod" not in configuration.enabled_plugins:
+    #         self.skipTest("The Debuginfod SymbolLocator plugin is not enabled")
 
     def test_normal_no_symbols(self):
         """
@@ -44,6 +44,7 @@ def test_normal_default(self):
         test_root = self.config_test(["a.out", "a.out.debug"])
         self.try_breakpoint(True)
 
+    @skipIfCurlSupportMissing
     def test_debuginfod_symbols(self):
         """
         Test behavior with the full binary available from Debuginfod as
@@ -52,6 +53,7 @@ def test_debuginfod_symbols(self):
         test_root = self.config_test(["a.out"], "a.out.unstripped")
         self.try_breakpoint(True)
 
+    @skipIfCurlSupportMissing
     def test_debuginfod_executable(self):
         """
         Test behavior with the full binary available from Debuginfod as
@@ -60,6 +62,7 @@ def test_debuginfod_executable(self):
         test_root = self.config_test(["a.out"], None, "a.out.unstripped")
         self.try_breakpoint(True)
 
+    @skipIfCurlSupportMissing
     def test_debuginfod_okd_symbols(self):
         """
         Test behavior with the 'only-keep-debug' symbols available from Debuginfod.
@@ -174,10 +177,9 @@ def config_test(self, local_files, debuginfo=None, executable=None):
 
     def getUUID(self, filename):
         try:
-            target = self.dbg.CreateTarget(self.getBuildArtifact(filename))
-            module = target.GetModuleAtIndex(0)
-            uuid = module.GetUUIDString().replace("-", "").lower()
-            self.dbg.DeleteTarget(target)
-            return uuid if len(uuid) == 40 else None
+            spec = lldb.SBModuleSpec()
+            spec.SetFileSpec(self.getBuildArtifact(filename))
+            uuid = lldb.SBModule(spec).GetUUIDString().replace("-", "").lower()
+            return uuid if len(uuid) > 8 else None # Shouldn't have CRC's in this field
         except:
             return None

lldb/test/API/debuginfod/SplitDWARF/TestDebuginfodDWP.py

@@ -25,11 +25,11 @@ class DebugInfodDWPTests(TestBase):
     # No need to try every flavor of debug inf.
     NO_DEBUG_INFO_TESTCASE = True
 
-    def setUp(self):
-        TestBase.setUp(self)
-        # Don't run these tests if we don't have Debuginfod support
-        if "Debuginfod" not in configuration.enabled_plugins:
-            self.skipTest("The Debuginfod SymbolLocator plugin is not enabled")
+    # def setUp(self):
+    #     TestBase.setUp(self)
+    #     # Don't run these tests if we don't have Debuginfod support
+    #     if "Debuginfod" not in configuration.enabled_plugins:
+    #         self.skipTest("The Debuginfod SymbolLocator plugin is not enabled")
 
     def test_normal_stripped(self):
         """
@@ -54,13 +54,15 @@ def test_normal_stripped_only_dwp(self):
         self.config_test(["a.out", "a.out.dwp"])
         self.try_breakpoint(False)
 
+    @skipIfCurlSupportMissing
     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
     def test_debuginfod_both_symfiles_from_service(self):
         """
         Test behavior with a stripped binary, with the unstripped binary and
@@ -69,6 +71,7 @@ def test_debuginfod_both_symfiles_from_service(self):
         self.config_test(["a.out"], "a.out.dwp", "a.out.unstripped")
         self.try_breakpoint(True)
 
+    @skipIfCurlSupportMissing
     def test_debuginfod_both_okd_symfiles_from_service(self):
         """
         Test behavior with both the only-keep-debug symbols and the dwp symbols
@@ -183,10 +186,9 @@ def config_test(self, local_files, debuginfo=None, executable=None):
 
     def getUUID(self, filename):
         try:
-            target = self.dbg.CreateTarget(self.getBuildArtifact(filename))
-            module = target.GetModuleAtIndex(0)
-            uuid = module.GetUUIDString().replace("-", "").lower()
-            self.dbg.DeleteTarget(target)
-            return uuid if len(uuid) == 40 else None
+            spec = lldb.SBModuleSpec()
+            spec.SetFileSpec(self.getBuildArtifact(filename))
+            uuid = lldb.SBModule(spec).GetUUIDString().replace("-", "").lower()
+            return uuid if len(uuid) > 8 else None # Shouldn't have CRC's in this field
         except:
             return None

lldb/test/API/lit.site.cfg.py.in

@@ -44,10 +44,6 @@ lldb_build_intel_pt = '@LLDB_BUILD_INTEL_PT@'
 if lldb_build_intel_pt == '1':
     config.enabled_plugins.append('intel-pt')
 
-llvm_enable_curl = '@LLVM_ENABLE_CURL@'
-if llvm_enable_curl == '1':
-    config.enabled_plugins.append('Debuginfod')
-
 # Additional dotest arguments can be passed to lit by providing a
 # semicolon-separates list: --param dotest-args="arg;arg".
 dotest_lit_args_str = lit_config.params.get('dotest-args', None)

lldb/test/CMakeLists.txt

@@ -238,7 +238,6 @@ endif()
 # These values are not canonicalized within LLVM.
 llvm_canonicalize_cmake_booleans(
   LLDB_BUILD_INTEL_PT
-  LLVM_ENABLE_CURL
   LLDB_ENABLE_PYTHON
   LLDB_ENABLE_LUA
   LLDB_ENABLE_LZMA