thisisnic commented on code in PR #48297:
URL: https://github.com/apache/arrow/pull/48297#discussion_r2627332153
##########
r/tools/test-nixlibs.R:
##########
@@ -49,102 +49,85 @@ test_that("compile_test_program()", {
expect_true(header_not_found("wrong/NOTAHEADER", fail))
})
-test_that("determine_binary_from_stderr", {
+test_that("has_curl_and_openssl", {
expect_output(
- expect_identical(
- determine_binary_from_stderr(compile_test_program("int a;")),
- "openssl-1.1"
+ expect_true(
+ has_curl_and_openssl(compile_test_program("int a;"))
),
- "Found libcurl and OpenSSL >= 1.1"
+ "Found libcurl and OpenSSL >= 3.0.0"
)
nixlibs_env$on_macos <- FALSE
expect_output(
- expect_identical(
- determine_binary_from_stderr(compile_test_program("#error Using OpenSSL
version 1.0")),
- "openssl-1.0"
+ expect_false(
+ has_curl_and_openssl(compile_test_program("#error OpenSSL version must
be 3.0 or greater"))
),
- "Found libcurl and OpenSSL < 1.1"
+ "OpenSSL found but version >= 3.0.0 is required"
)
- nixlibs_env$on_macos <- TRUE
expect_output(
Review Comment:
Yup!
##########
r/tools/nixlibs.R:
##########
@@ -192,17 +192,12 @@ download_binary <- function(lib) {
# of action based on the current system. Other values you can set it to:
# * "FALSE" (not case-sensitive), to skip this option altogether
# * "TRUE" (not case-sensitive), to try to discover your current OS, or
-# * Some other string: a "linux-openssl-${OPENSSL_VERSION}" that corresponds to
-# a binary that is available, to override what this function may discover by
-# default.
+# * Some other string: a binary identifier that corresponds to a binary that is
Review Comment:
Updated
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
