GH-37936: [CI] Fix integration testing in rc-verify nightly builds (#…

…37933) * Closes: #37936 Authored-by: Antoine Pitrou <antoine@python.org> Signed-off-by: Antoine Pitrou <antoine@python.org>
apache · Oct 9, 2023 · 832511a · 832511a
1 parent b3362f2
commit 832511a
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 6 deletions.
diff --git a/ci/scripts/go_build.sh b/ci/scripts/go_build.sh
@@ -50,13 +50,13 @@ if [[ -n "${ARROW_GO_INTEGRATION}" ]]; then
             go_lib="arrow_go_integration.so"
             ;;
         Darwin)
-            go_lib="arrow_go_integration.so"
+            go_lib="arrow_go_integration.dylib"
             ;;
         MINGW*)
             go_lib="arrow_go_integration.dll"
             ;;
     esac
-    go build -tags cdata_integration,assert -buildmode=c-shared -o ${go_lib} .
+    go build -buildvcs=false -tags cdata_integration,assert -buildmode=c-shared -o ${go_lib} .
 
     popd
 fi
diff --git a/dev/archery/archery/integration/tester_cpp.py b/dev/archery/archery/integration/tester_cpp.py
@@ -18,6 +18,7 @@
 import contextlib
 import functools
 import os
+import sys
 import subprocess
 
 from . import cdata
@@ -41,7 +42,12 @@
     "localhost",
 ]
 
-_dll_suffix = ".dll" if os.name == "nt" else ".so"
+if sys.platform == "darwin":
+    _dll_suffix = ".dylib"
+elif os.name == "nt":
+    _dll_suffix = ".dll"
+else:
+    _dll_suffix = ".so"
 
 _DLL_PATH = _EXE_PATH
 _ARROW_DLL = os.path.join(_DLL_PATH, "libarrow" + _dll_suffix)

diff --git a/dev/archery/archery/integration/tester_go.py b/dev/archery/archery/integration/tester_go.py
@@ -18,6 +18,7 @@
 import contextlib
 import functools
 import os
+import sys
 import subprocess
 
 from . import cdata
@@ -42,7 +43,12 @@
     "localhost",
 ]
 
-_dll_suffix = ".dll" if os.name == "nt" else ".so"
+if sys.platform == "darwin":
+    _dll_suffix = ".dylib"
+elif os.name == "nt":
+    _dll_suffix = ".dll"
+else:
+    _dll_suffix = ".so"
 
 _DLL_PATH = os.path.join(
     ARROW_ROOT_DEFAULT,

diff --git a/dev/archery/generate_files_for_endian_test.sh b/dev/archery/generate_files_for_endian_test.sh
@@ -29,7 +29,7 @@ set -e
 json_dir=$TMP_DIR/arrow.$$
 mkdir -p $json_dir
 
-archery integration --stop-on-error --with-cpp=1 --tempdir=$json_dir
+archery integration --stop-on-error --run-ipc --with-cpp=1 --tempdir=$json_dir
 
 for f in $json_dir/*.json ; do
     $ARROW_CPP_EXE_PATH/arrow-json-integration-test -mode JSON_TO_ARROW -json $f -arrow ${f%.*}.arrow_file -integration true ;

diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh
@@ -868,6 +868,22 @@ test_go() {
   go test ./...
   go install -buildvcs=false ./...
   go clean -modcache
+  pushd arrow/internal/cdata_integration
+
+  case "$(uname)" in
+    Linux)
+      go_lib="arrow_go_integration.so"
+      ;;
+    Darwin)
+      go_lib="arrow_go_integration.dylib"
+      ;;
+    MINGW*)
+      go_lib="arrow_go_integration.dll"
+      ;;
+  esac
+  go build -buildvcs=false -tags cdata_integration,assert -buildmode=c-shared -o ${go_lib} .
+
+  popd
   popd
 }
 
@@ -878,7 +894,7 @@ test_integration() {
   maybe_setup_conda || exit 1
   maybe_setup_virtualenv || exit 1
 
-  pip install -e dev/archery
+  pip install -e dev/archery[integration]
 
   JAVA_DIR=$ARROW_SOURCE_DIR/java
   CPP_BUILD_DIR=$ARROW_TMPDIR/cpp-build
@@ -894,6 +910,7 @@ test_integration() {
 
   # Flight integration test executable have runtime dependency on release/libgtest.so
   LD_LIBRARY_PATH=$ARROW_CPP_EXE_PATH:$LD_LIBRARY_PATH archery integration \
+    --run-ipc --run-flight --run-c-data \
     --with-cpp=${TEST_INTEGRATION_CPP} \
     --with-java=${TEST_INTEGRATION_JAVA} \
     --with-js=${TEST_INTEGRATION_JS} \

diff --git a/go/go.sum b/go/go.sum
@@ -19,8 +19,11 @@ github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+m
 github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
 github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
+github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/goccy/go-yaml v1.11.0 h1:n7Z+zx8S9f9KgzG6KtQKf+kwqXZlLNR2F6018Dgau54=
@@ -50,6 +53,7 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
+github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=