amoeba commented on code in PR #4937:
URL: https://github.com/apache/arrow-adbc/pull/4937#discussion_r4344841313
##########
dev/release/verify-release-candidate.sh:
##########
@@ -944,16 +959,21 @@ print(version.text)
fi
done
- mvn -B install:install-file \
- "${maven_repository_argument}" \
+ mvn "${maven_arguments[@]}" install:install-file \
"-Dfile=${jar_path}" \
"-DpomFile=${pom_path}" \
"-Dsources=${sources_path}" \
"-Djavadoc=${javadoc_path}"
done
- mvn -B test \
- "${maven_repository_argument}" \
+ local test_arguments=()
+ if [[ "$(uname)" == "Darwin" && "$(uname -m)" == "x86_64" ]]; then
+ show_info "Skipping testDriverJni: JNI binaries are not available for
macOS/x86_64"
+ test_arguments+=('-Dtest=!VerifyReleaseCandidateTest#testDriverJni')
+ fi
+
+ mvn "${maven_arguments[@]}" test \
+ "${test_arguments[@]}" \
Review Comment:
Would this be cleaner if we put this in the Java test?
```patch
diff --git a/dev/release/verify-release-candidate.sh
b/dev/release/verify-release-candidate.sh
index 3c8e123f2..c59fa0fdc 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -966,14 +966,7 @@ print(version.text)
"-Djavadoc=${javadoc_path}"
done
- local test_arguments=()
- if [[ "$(uname)" == "Darwin" && "$(uname -m)" == "x86_64" ]]; then
- show_info "Skipping testDriverJni: JNI binaries are not available for
macOS/x86_64"
- test_arguments+=('-Dtest=!VerifyReleaseCandidateTest#testDriverJni')
- fi
-
mvn "${maven_arguments[@]}" test \
- "${test_arguments[@]}" \
"-Dadbc.version=${java_version}" \
-f "${SOURCE_DIR}/verify/java/pom.xml"
}
diff --git
a/dev/release/verify/java/src/test/java/org/apache/arrow/adbc/verify/VerifyReleaseCandidateTest.java
b/dev/release/verify/java/src/test/java/org/apache/arrow/adbc/verify/VerifyReleaseCandidateTest.java
index 83f6d5512..03c4abfcc 100644
---
a/dev/release/verify/java/src/test/java/org/apache/arrow/adbc/verify/VerifyReleaseCandidateTest.java
+++
b/dev/release/verify/java/src/test/java/org/apache/arrow/adbc/verify/VerifyReleaseCandidateTest.java
@@ -85,6 +85,17 @@ class VerifyReleaseCandidateTest {
@Test
void testDriverJni() {
var driver = new JniDriver(allocator);
+ if (OS.MAC.isCurrentOs() &&
"x86_64".equalsIgnoreCase(System.getProperty("os.arch"))) {
+ // JNI binaries are not available for macOS x86_64.
+ ExceptionInInitializerError exception =
+ assertThrows(
+ ExceptionInInitializerError.class, () ->
driver.load().driver("nonexistent").open());
+ assertThat(exception)
+ .hasRootCauseInstanceOf(RuntimeException.class)
+ .hasRootCauseMessage("ADBC JNI driver not supported on
architecture x86_64");
+ return;
+ }
+
if (OS.WINDOWS.isCurrentOs() &&
"aarch64".equalsIgnoreCase(System.getProperty("os.arch"))) {
// JNI binaries are not available for Windows ARM64.
ExceptionInInitializerError exception =
```
--
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]
