This is an automated email from the ASF dual-hosted git repository.
paleolimbot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-nanoarrow.git
The following commit(s) were added to refs/heads/main by this push:
new d6eb52bb refactor: Remove CMake requirement from Meson IPC config
(#522)
d6eb52bb is described below
commit d6eb52bb0f18c2b2a49456a95d97d646ab54d3b4
Author: William Ayd <[email protected]>
AuthorDate: Wed Jun 12 12:48:33 2024 -0400
refactor: Remove CMake requirement from Meson IPC config (#522)
Follow up to https://github.com/apache/arrow-nanoarrow/pull/483
---
ci/scripts/build-with-meson.sh | 2 +-
src/nanoarrow/meson.build | 15 +++++++++------
subprojects/flatcc.wrap | 3 +++
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ci/scripts/build-with-meson.sh b/ci/scripts/build-with-meson.sh
index cd76c6db..85bff22b 100755
--- a/ci/scripts/build-with-meson.sh
+++ b/ci/scripts/build-with-meson.sh
@@ -66,7 +66,7 @@ function main() {
pushd "${SANDBOX_DIR}"
show_header "Run test suite"
- meson configure -Dtests=true -Db_coverage=true
+ meson configure -Dtests=true -Db_coverage=true -Dipc=true
meson compile
meson test --wrap='valgrind --track-origins=yes --leak-check=full'
--print-errorlogs
diff --git a/src/nanoarrow/meson.build b/src/nanoarrow/meson.build
index ccf59c99..e96d98b1 100644
--- a/src/nanoarrow/meson.build
+++ b/src/nanoarrow/meson.build
@@ -65,11 +65,7 @@ nanoarrow_dep = declare_dependency(include_directories:
[curdir, incdir],
link_with: nanoarrow_lib)
if get_option('ipc')
- cmake = import('cmake')
- cmake_opts = cmake.subproject_options()
- cmake_opts.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': true})
- flatcc_subproj = cmake.subproject('flatcc', options: cmake_opts)
- flatcc_dep = flatcc_subproj.dependency('flatccrt')
+ flatcc_dep = dependency('flatcc')
nanoarrow_ipc_lib = build_target(
'nanoarrow_ipc',
@@ -172,9 +168,14 @@ if get_option('tests')
ipc_test_files = {
'nanoarrow-ipc-decoder': {
'deps': [nanoarrow_ipc_dep, arrow_dep, gtest_dep],
+ 'timeout': 30,
},
'nanoarrow-ipc-reader': {
'deps': [nanoarrow_ipc_dep, arrow_dep, gtest_dep],
+ # the ipc reader test can take longer when executed
+ # under valgrind, hence the increased timeout
+ 'timeout': 90,
+
},
'nanoarrow-ipc-files': {
'deps': [
@@ -184,9 +185,11 @@ if get_option('tests')
gtest_dep,
nlohmann_json_dep
],
+ 'timeout': 30,
},
'nanoarrow-ipc-hpp': {
'deps': [nanoarrow_ipc_dep, gtest_dep],
+ 'timeout': 30,
},
}
@@ -196,7 +199,7 @@ if get_option('tests')
name.replace('-', '_') + '_test.cc',
dependencies: config['deps']
)
- test(name, exc)
+ test(name, exc, timeout: config['timeout'])
endforeach
endif
endif
diff --git a/subprojects/flatcc.wrap b/subprojects/flatcc.wrap
index 311425ae..811cf38c 100644
--- a/subprojects/flatcc.wrap
+++ b/subprojects/flatcc.wrap
@@ -21,3 +21,6 @@ source_url =
https://github.com/dvidelabs/flatcc/archive/refs/tags/v0.6.1.tar.gz
source_filename = flatcc-0.6.1.tar.gz
source_hash = 2533c2f1061498499f15acc7e0937dcf35bc68e685d237325124ae0d6c600c2b
patch_directory = flatcc
+
+[provide]
+flatcc = flatcc_dep
