Skip to content

Commit

Permalink
make it easier to test path locally, reenable output
Browse files Browse the repository at this point in the history
  • Loading branch information
paleolimbot committed Dec 21, 2023
1 parent 57c09ed commit 3e059f7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
9 changes: 0 additions & 9 deletions ci/scripts/nanoarrow_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,7 @@ set -x
mkdir -p ${build_dir}
pushd ${build_dir}

# Build nanoarrow C Data integration tests
mkdir -p cdata && pushd cdata
cmake ${source_dir} -DNANOARROW_BUILD_INTEGRATION_TESTS=ON
cmake --build .
popd

# Build nanoarrow IPC integration tests
mkdir -p ipc && pushd ipc
cmake ${source_dir}/extensions/nanoarrow_ipc -DNANOARROW_IPC_BUILD_APPS=ON
cmake --build .
popd

popd
10 changes: 4 additions & 6 deletions dev/archery/archery/integration/tester_nanoarrow.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@

_NANOARROW_PATH = os.environ.get(
"ARROW_NANOARROW_PATH",
os.path.join(ARROW_ROOT_DEFAULT, "nanoarrow"),
os.path.join(ARROW_ROOT_DEFAULT, "nanoarrow/cdata"),
)

_INTEGRATION_DLL = os.path.join(
_NANOARROW_PATH, "cdata/libnanoarrow_c_data_integration" + cdata.dll_suffix
_NANOARROW_PATH, "libnanoarrow_c_data_integration" + cdata.dll_suffix
)


Expand Down Expand Up @@ -105,10 +105,8 @@ def _check_nanoarrow_error(self, na_error):
"""
assert self.ffi.typeof(na_error) is self.ffi.typeof("const char*")
if na_error != self.ffi.NULL:
# TODO: remove these...at least one call is returning a non-null-terminated
# message causing a crash.
# error = self.ffi.string(na_error).decode("utf8", errors="replace")
raise RuntimeError("nanoarrow C Data Integration call failed")
error = self.ffi.string(na_error).decode("utf8", errors="replace")
raise RuntimeError(f"nanoarrow C Data Integration call failed: {error}")


class NanoarrowCDataExporter(CDataExporter, _CDataBase):
Expand Down

0 comments on commit 3e059f7

Please sign in to comment.