Positive tests only run if we have libcurl

Author: Kevin Frei

lldb/test/Shell/Debuginfod/okdstrip-positive-a.test

@@ -1,4 +1,4 @@
-# REQUIRES: system-linux && native && target-x86_64
+# REQUIRES: curl && system-linux && native && target-x86_64
 
 # Scenario 2a:
 #  A stripped binary, with an "-only-keep-debug" symbols file.

lldb/test/Shell/Debuginfod/okdstrip-positive-b.test

@@ -1,4 +1,4 @@
-# REQUIRES: system-linux && native && target-x86_64
+# REQUIRES: curl && system-linux && native && target-x86_64
 
 # Scenario 2b:
 #  A stripped binary, with an "-only-keep-debug" symbols file.

lldb/test/Shell/Debuginfod/split-okdstrip-positive.test

@@ -1,4 +1,4 @@
-# REQUIRES: system-linux && native && target-x86_64
+# REQUIRES: curl && system-linux && native && target-x86_64
 
 # Scenario 5:
 # * A stripped, split binary, with --add-gnu-debuglink symbol file where

lldb/test/Shell/Debuginfod/split-positive.test

@@ -1,4 +1,4 @@
-# REQUIRES: system-linux && native && target-x86_64
+# REQUIRES: curl && system-linux && native && target-x86_64
 
 # Scenario 3:
 # * A split-dwarf binary with a Debuginfod-hosted .dwp file.
@@ -25,6 +25,6 @@
 # CHECK-NEXT: Type: "dwo"
 # CHECK-NEXT: Dwo ID{{.*}}
 # CHECK-NEXT: {{[- ]+}}
-# The cache key is stable, so mandating it's location verifies it was cached
-# The '.tmp' (sort of) ensures the cache is our private cache, not the system cache
+# The cache key is stable, so mandating it's location verifies it was cached.
+# The '.tmp' (sort of) ensures the cache is our private cache, not the system cache.
 # CHECK-NEXT: {{0x[0-9a-f]+.* +}}/{{.*}}.tmp/cache/llvmcache-6559017670391320133{{ *$}}

lldb/test/Shell/Debuginfod/split-strip-positive.test

@@ -1,4 +1,4 @@
-# REQUIRES: system-linux && native && target-x86_64
+# REQUIRES: curl && system-linux && native && target-x86_64
 
 # Scenario 4:
 # * A stripped, split binary, with the unstripped binary and .dwp file

lldb/test/Shell/Debuginfod/strip-positive-a.test

@@ -1,4 +1,4 @@
-# REQUIRES: system-linux && native && target-x86_64
+# REQUIRES: curl && system-linux && native && target-x86_64
 
 # Scenario 1a:
 # * A plain stripped binary

lldb/test/Shell/Debuginfod/strip-positive-b.test

@@ -1,4 +1,4 @@
-# REQUIRES: system-linux && native && target-x86_64
+# REQUIRES: curl && system-linux && native && target-x86_64
 
 # Scenario 1b:
 # * A plain stripped binary

lldb/test/Shell/lit.cfg.py

@@ -144,6 +144,9 @@ def calculate_arch_features(arch_string):
 if config.lldb_system_debugserver:
     config.available_features.add("system-debugserver")
 
+if config.llvm_enable_curl:
+    config.available_features.add("curl")
+
 if config.have_lldb_server:
     config.available_features.add("lldb-server")
 

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

@@ -19,6 +19,7 @@ config.python_executable = "@Python3_EXECUTABLE@"
 config.have_zlib = @LLVM_ENABLE_ZLIB@
 config.objc_gnustep_dir = "@LLDB_TEST_OBJC_GNUSTEP_DIR@"
 config.lldb_enable_lzma = @LLDB_ENABLE_LZMA@
+config.llvm_enable_curl = @LLVM_ENABLE_CURL@
 config.host_triple = "@LLVM_HOST_TRIPLE@"
 config.lldb_bitness = 64 if @LLDB_IS_64_BITS@ else 32
 config.lldb_enable_python = @LLDB_ENABLE_PYTHON@

llvm/lib/Debuginfod/Debuginfod.cpp

@@ -158,6 +158,7 @@ Expected<std::string> getCachedOrDownloadDebuginfo(BuildIDRef ID) {
   std::string UrlPath = getDebuginfodDebuginfoUrlPath(ID);
   return getCachedOrDownloadArtifact(getDebuginfodCacheKey(UrlPath), UrlPath);
 }
+
 // General fetching function.
 Expected<std::string> getCachedOrDownloadArtifact(StringRef UniqueKey,
                                                   StringRef UrlPath) {