Revert "rephrase nixlib test compilation messages"

This reverts commit a7eb7d5.
assignUser · Nov 30, 2023 · 7a7e8a7 · 7a7e8a7
1 parent 908558c
commit 7a7e8a7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/r/tools/nixlibs.R b/r/tools/nixlibs.R
@@ -295,32 +295,32 @@ determine_binary_from_stderr <- function(errs) {
   if (is.null(attr(errs, "status"))) {
     # There was no error in compiling: so we found libcurl and OpenSSL >= 1.1,
     # openssl is < 3.0
-    lg("Found headers for libcurl and OpenSSL >= 1.1")
+    lg("Found libcurl and OpenSSL >= 1.1")
     return("openssl-1.1")
     # Else, check for dealbreakers:
   } else if (!on_macos && any(grepl("Using libc++", errs, fixed = TRUE))) {
     # Our linux binaries are all built with GNU stdlib so they fail with libc++
     lg("Linux binaries incompatible with libc++")
     return(NULL)
   } else if (header_not_found("curl/curl", errs)) {
-    lg("Headers for libcurl not found")
+    lg("libcurl not found")
     return(NULL)
   } else if (header_not_found("openssl/opensslv", errs)) {
-    lg("Headers for OpenSSL not found")
+    lg("OpenSSL not found")
     return(NULL)
   } else if (any(grepl("OpenSSL version too old", errs))) {
-    lg("Headers for OpenSSL found but version >= 1.0.2 is required for some features")
+    lg("OpenSSL found but version >= 1.0.2 is required for some features")
     return(NULL)
     # Else, determine which other binary will work
   } else if (any(grepl("Using OpenSSL version 1.0", errs))) {
     if (on_macos) {
       lg("OpenSSL 1.0 is not supported on macOS")
       return(NULL)
     }
-    lg("Found headers for libcurl and OpenSSL < 1.1")
+    lg("Found libcurl and OpenSSL < 1.1")
     return("openssl-1.0")
   } else if (any(grepl("Using OpenSSL version 3", errs))) {
-    lg("Found headers for libcurl and OpenSSL >= 3.0.0")
+    lg("Found libcurl and OpenSSL >= 3.0.0")
     return("openssl-3.0")
   }
   NULL

diff --git a/r/tools/test-nixlibs.R b/r/tools/test-nixlibs.R
@@ -52,7 +52,7 @@ test_that("determine_binary_from_stderr", {
       determine_binary_from_stderr(compile_test_program("int a;")),
       "openssl-1.1"
     ),
-    "Found headers for libcurl and OpenSSL >= 1.1"
+    "Found libcurl and OpenSSL >= 1.1"
   )
 
   nixlibs_env$on_macos <- FALSE
@@ -61,7 +61,7 @@ test_that("determine_binary_from_stderr", {
       determine_binary_from_stderr(compile_test_program("#error Using OpenSSL version 1.0")),
       "openssl-1.0"
     ),
-    "Found headers for libcurl and OpenSSL < 1.1"
+    "Found libcurl and OpenSSL < 1.1"
   )
   nixlibs_env$on_macos <- TRUE
   expect_output(
@@ -75,7 +75,7 @@ test_that("determine_binary_from_stderr", {
       determine_binary_from_stderr(compile_test_program("#error Using OpenSSL version 3")),
       "openssl-3.0"
     ),
-    "Found headers for libcurl and OpenSSL >= 3.0.0"
+    "Found libcurl and OpenSSL >= 3.0.0"
   )
   expect_output(
     expect_null(
@@ -92,50 +92,50 @@ test_that("select_binary() with test program", {
       select_binary("linux", "x86_64", "int a;"),
       "linux-openssl-1.1"
     ),
-    "Found headers for libcurl and OpenSSL >= 1.1"
+    "Found libcurl and OpenSSL >= 1.1"
   )
   expect_output(
     expect_identical(
       select_binary("linux", "x86_64", "#error Using OpenSSL version 1.0"),
       "linux-openssl-1.0"
     ),
-    "Found headers for libcurl and OpenSSL < 1.1"
+    "Found libcurl and OpenSSL < 1.1"
   )
   expect_output(
     expect_identical(
       select_binary("linux", "x86_64", "#error Using OpenSSL version 3"),
       "linux-openssl-3.0"
     ),
-    "Found headers for libcurl and OpenSSL >= 3.0.0"
+    "Found libcurl and OpenSSL >= 3.0.0"
   )
   nixlibs_env$on_macos <- TRUE
   expect_output(
     expect_identical(
       select_binary("darwin", "x86_64", "int a;"),
       "darwin-x86_64-openssl-1.1"
     ),
-    "Found headers for libcurl and OpenSSL >= 1.1"
+    "Found libcurl and OpenSSL >= 1.1"
   )
   expect_output(
     expect_identical(
       select_binary("darwin", "x86_64", "#error Using OpenSSL version 3"),
       "darwin-x86_64-openssl-3.0"
     ),
-    "Found headers for libcurl and OpenSSL >= 3.0.0"
+    "Found libcurl and OpenSSL >= 3.0.0"
   )
   expect_output(
     expect_identical(
       select_binary("darwin", "arm64", "int a;"),
       "darwin-arm64-openssl-1.1"
     ),
-    "Found headers for libcurl and OpenSSL >= 1.1"
+    "Found libcurl and OpenSSL >= 1.1"
   )
   expect_output(
     expect_identical(
       select_binary("darwin", "arm64", "#error Using OpenSSL version 3"),
       "darwin-arm64-openssl-3.0"
     ),
-    "Found headers for libcurl and OpenSSL >= 3.0.0"
+    "Found libcurl and OpenSSL >= 3.0.0"
   )
   expect_output(
     expect_null(