Add option for testing without Arrow

Author: WillAyd

.github/workflows/build-and-test-device.yaml

@@ -98,8 +98,8 @@ jobs:
           cd build
           export VERBOSE=1
           cmake .. -DCMAKE_BUILD_TYPE=Debug -DNANOARROW_DEVICE=ON \
-            -DNANOARROW_BUILD_TESTS=ON -DCMAKE_PREFIX_PATH="${ARROW_PATH}" \
-            ${{ matrix.config.cmake_args }}
+            -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_BUILD_TESTS_WITH_ARROW=ON \
+            -DCMAKE_PREFIX_PATH="${ARROW_PATH}" ${{ matrix.config.cmake_args }}
 
           cmake --build .
 

.github/workflows/build-and-test-ipc.yaml

@@ -91,8 +91,8 @@ jobs:
           cd build
 
           cmake .. -DCMAKE_BUILD_TYPE=Debug -DNANOARROW_BUILD_TESTS=ON \
-            -DNANOARROW_IPC=ON -DCMAKE_PREFIX_PATH="${ARROW_PATH}" \
-            ${{ matrix.config.cmake_args }}
+            -DNANOARROW_BUILD_TESTS_WITH_ARROW=ON  -DNANOARROW_IPC=ON \
+            -DCMAKE_PREFIX_PATH="${ARROW_PATH}" ${{ matrix.config.cmake_args }}
 
           cmake --build .
 

.github/workflows/build-and-test.yaml

@@ -82,7 +82,8 @@ jobs:
           cd build
 
           cmake .. -DNANOARROW_BUILD_TESTS=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-            -DCMAKE_PREFIX_PATH="${ARROW_PATH}" ${{ matrix.config.cmake_args }}
+            -DNANOARROW_BUILD_TESTS_WITH_ARROW=ON -DCMAKE_PREFIX_PATH="${ARROW_PATH}" \
+            ${{ matrix.config.cmake_args }}
 
           cmake --build .
 
@@ -167,8 +168,8 @@ jobs:
 
       - name: Build nanoarrow
         run: |
-          cmake -S . -B build -DNANOARROW_BUILD_TESTS=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-            -DCMAKE_PREFIX_PATH="${ARROW_PATH}"
+          cmake -S . -B build -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_BUILD_TESTS_WITH_ARROW=OFF \
+          -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_PREFIX_PATH="${ARROW_PATH}"
 
           cmake --build build
 

.github/workflows/clang-tidy.yaml

@@ -66,9 +66,9 @@ jobs:
           cd build
 
           cmake .. -DNANOARROW_DEVICE=ON -DNANOARROW_IPC=ON \
-            -DNANOARROW_BUILD_TESTS=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-            -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -DCMAKE_PREFIX_PATH="${ARROW_PATH}"
+            -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_BUILD_TESTS_WITH_ARROW=ON \
+            -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Debug \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_PREFIX_PATH="${ARROW_PATH}"
 
           cmake --build .
 

CMakeLists.txt

@@ -45,6 +45,7 @@ option(NANOARROW_DEVICE_WITH_CUDA "Build CUDA libraries" OFF)
 # Development options
 option(NANOARROW_BUILD_APPS "Build utility applications" OFF)
 option(NANOARROW_BUILD_TESTS "Build tests" OFF)
+option(NANOARROW_BUILD_TESTS_WITH_ARROW "Build tests that require Arrow" OFF)
 option(NANOARROW_BUILD_BENCHMARKS "Build benchmarks" OFF)
 option(NANOARROW_BUILD_INTEGRATION_TESTS
        "Build cross-implementation Arrow integration tests" OFF)
@@ -428,7 +429,9 @@ if(NANOARROW_BUILD_TESTS)
     message(STATUS "Arrow SO version: ${ARROW_FULL_SO_VERSION}")
 
     # TODO: does this propoagate to projects using as a subproject?
-    add_compile_definitions("-DNANOARROW_ARROW_FOUND")
+    if(NANOARROW_BUILD_TESTS_WITH_ARROW)
+      add_compile_definitions("-DNANOARROW_BUILD_TESTS_WITH_ARROW")
+    endif()
 
     # Give caller the option to link a static version of Arrow C++
     if(NANOARROW_ARROW_STATIC)

CMakePresets.json

@@ -21,6 +21,7 @@
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Debug",
                 "NANOARROW_BUILD_TESTS": "ON"
+                "NANOARROW_BUILD_TESTS_WITH_ARROW": "ON"
             }
         },
         {

README.md

@@ -127,16 +127,23 @@ cmake ..
 cmake --build .
 ```
 
-Building nanoarrow with tests currently requires [Arrow C++](https://arrow.apache.org/install/).
-If installed via a system package manager like `apt`, `dnf`, or `brew`, the tests can be
-built with:
+To build nanoarrow along with tests run:
 
 ```sh
 mkdir build && cd build
 cmake .. -DNANOARROW_BUILD_TESTS=ON
 cmake --build .
 ```
 
+If you are able to install [Arrow C++](https://arrow.apache.org/install/) you can enable
+more testing:
+
+```sh
+mkdir build && cd build
+cmake .. -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_BUILD_TESTS_WITH_ARROW=ON
+cmake --build .
+```
+
 Tests can be run with `ctest`.
 
 ### Building with Meson

ci/scripts/coverage.sh

@@ -74,7 +74,8 @@ function main() {
 
     cmake "${TARGET_NANOARROW_DIR}" \
           -DNANOARROW_DEVICE=ON -DNANOARROW_IPC=ON \
-          -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_CODE_COVERAGE=ON
+          -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_BUILD_TESTS_WITH_ARROW=ON \
+          -DNANOARROW_CODE_COVERAGE=ON
     cmake --build .
     CTEST_OUTPUT_ON_FAILURE=1 ctest .
 

dev/release/verify-release-candidate.sh

@@ -243,12 +243,14 @@ test_cmake_project() {
 
 test_c() {
   show_header "Build and test C library"
-  test_cmake_project build . -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_IPC=ON
+  test_cmake_project build . -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_IPC=ON \
+                     -DNANOARROW_BUILD_TESTS_WITH_ARROW=ON
 }
 
 test_c_bundled() {
   show_header "Build test bundled C library"
-  test_cmake_project build-bundled . -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_IPC=ON -DNANOARROW_BUNDLE=ON
+  test_cmake_project build-bundled . -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_IPC=ON \
+                     -DNANOARROW_BUILD_TESTS_WITH_ARROW=ON -DNANOARROW_BUNDLE=ON
 }
 
 test_r() {

meson.build

@@ -48,9 +48,11 @@ add_project_arguments(
 
 # The system include suppresses compilation warnings from Arrow
 arrow_dep = dependency('arrow', include_type: 'system', required: false)
-if arrow_dep.found()
-  add_project_arguments('-DNANOARROW_ARROW_FOUND', language : 'c')
-  add_project_arguments('-DNANOARROW_ARROW_FOUND', language : 'cpp')
+if get_option('tests_with_arrow') and not arrow_dep.found()
+  error('tests_with_arrow=true but could not find Arrow')
+elif get_option('tests_with_arrow')
+  add_project_arguments('-DNANOARROW_BUILD_TESTS_WITH_ARROW', language : 'c')
+  add_project_arguments('-DNANOARROW_BUILD_TESTS_WITH_ARROW', language : 'cpp')
 endif
 
 if get_option('buildtype') in ['debug', 'debugoptimized']

meson.options

@@ -16,6 +16,7 @@
 # under the License.
 
 option('tests', type: 'boolean', description: 'Build tests', value: false)
+option('tests_with_arrow', type: 'boolean', description: 'Build tests with Arrow', value: false)
 option('benchmarks', type: 'boolean', description: 'Build benchmarks', value: false)
 option('apps', type: 'boolean', description: 'Build utility applications', value: false)
 option('ipc', type: 'boolean', description: 'Build IPC libraries', value: false)

src/nanoarrow/common/array_test.cc

@@ -20,7 +20,7 @@
 #include <cmath>
 #include <cstdint>
 
-#if defined(NANOARROW_ARROW_FOUND)
+#if defined(NANOARROW_BUILD_TESTS_WITH_ARROW)
 #include <arrow/array.h>
 #include <arrow/array/builder_binary.h>
 #include <arrow/array/builder_decimal.h>
@@ -40,7 +40,7 @@
 
 #include "nanoarrow/nanoarrow.hpp"
 
-#if defined(NANOARROW_ARROW_FOUND)
+#if defined(NANOARROW_BUILD_TESTS_WITH_ARROW)
 using namespace arrow;
 #endif
 using namespace nanoarrow::literals;
@@ -50,7 +50,7 @@ using testing::ElementsAre;
 // Lightweight versions of ArrowTesting's ARROW_EXPECT_OK. This
 // version accomplishes the task of making sure the status message
 // ends up in the ctests log.
-#if defined(NANOARROW_ARROW_FOUND)
+#if defined(NANOARROW_BUILD_TESTS_WITH_ARROW)
 void ARROW_EXPECT_OK(Status status) {
   if (!status.ok()) {
     throw std::runtime_error(status.message());
@@ -386,7 +386,7 @@ INSTANTIATE_TEST_SUITE_P(NanoarrowIpcTest, UnparameterizedTypeTestFixture,
                          ::testing::Values(NANOARROW_TYPE_NA, NANOARROW_TYPE_INT32,
                                            NANOARROW_TYPE_BINARY, NANOARROW_TYPE_STRUCT));
 
-#if defined(NANOARROW_ARROW_FOUND)
+#if defined(NANOARROW_BUILD_TESTS_WITH_ARROW)
 TEST(ArrayTest, ArrayTestAppendToNullArray) {
   struct ArrowArray array;
   ASSERT_EQ(ArrowArrayInitFromType(&array, NANOARROW_TYPE_NA), NANOARROW_OK);
@@ -585,7 +585,7 @@ TEST(ArrayTest, ArrayTestAppendEmptyToString) {
   ArrowArrayRelease(&array);
 }
 
-#if defined(NANOARROW_ARROW_FOUND)
+#if defined(NANOARROW_BUILD_TESTS_WITH_ARROW)
 TEST(ArrayTest, ArrayTestAppendToUInt64Array) {
   struct ArrowArray array;
 
@@ -639,7 +639,7 @@ TEST(ArrayTest, ArrayTestAppendToUInt32Array) {
   ArrowArrayRelease(&array);
 }
 
-#if defined(NANOARROW_ARROW_FOUND)
+#if defined(NANOARROW_BUILD_TESTS_WITH_ARROW)
 TEST(ArrayTest, ArrayTestAppendToUInt16Array) {
   struct ArrowArray array;
 
@@ -1107,7 +1107,7 @@ TEST(ArrayTest, ArrayTestAppendToIntervalArrayYearMonth) {
   ArrowArrayRelease(&array);
 }
 
-#if defined(NANOARROW_ARROW_FOUND)
+#if defined(NANOARROW_BUILD_TESTS_WITH_ARROW)
 TEST(ArrayTest, ArrayTestAppendToIntervalArrayDayTime) {
   struct ArrowArray array;
 
@@ -1549,7 +1549,7 @@ TEST(ArrayTest, ArrayTestAppendToListArrayErrors) {
   ArrowSchemaRelease(&schema);
 }
 
-#if defined(NANOARROW_ARROW_FOUND)
+#if defined(NANOARROW_BUILD_TESTS_WITH_ARROW)
 TEST(ArrayTest, ArrayTestAppendToStructArray) {
   struct ArrowArray array;
   struct ArrowSchema schema;
@@ -1792,7 +1792,7 @@ TEST(ArrayTest, ArrayTestUnionUtils) {
   EXPECT_FALSE(_ArrowUnionTypeIdsWillEqualChildIndices("0,2", 2));
 }
 
-#if defined(NANOARROW_ARROW_FOUND)
+#if defined(NANOARROW_BUILD_TESTS_WITH_ARROW)
 TEST(ArrayTest, ArrayTestAppendToDenseUnionArray) {
   struct ArrowArray array;
   struct ArrowSchema schema;
@@ -3268,7 +3268,7 @@ TEST(ArrayTest, ArrayViewTestSparseUnionGet) {
 // the "value type" that would correspond to what ArrowArrayViewGetDoubleUnsafe()
 // or ArrowArrayAppendDouble() do since they operate on the logical/represented
 // value.
-#if defined(NANOARROW_ARROW_FOUND)
+#if defined(NANOARROW_BUILD_TESTS_WITH_ARROW)
 template <typename TypeClass, typename BuilderValueT>
 BuilderValueT logical_value_to_builder_value(int64_t value) {
   return static_cast<BuilderValueT>(value);
@@ -3439,7 +3439,7 @@ TEST(ArrayViewTest, ArrayViewTestGetFloat16) {
   ArrowSchemaRelease(&schema);
 }
 
-#if defined(NANOARROW_ARROW_FOUND)
+#if defined(NANOARROW_BUILD_TESTS_WITH_ARROW)
 template <typename BuilderClass>
 void TestGetFromBinary(BuilderClass& builder) {
   struct ArrowArray array;
@@ -3655,7 +3655,7 @@ TEST(ArrayViewTest, ArrayViewTestGetIntervalYearMonth) {
   ArrowArrayRelease(&array);
 }
 
-#if defined(NANOARROW_ARROW_FOUND)
+#if defined(NANOARROW_BUILD_TESTS_WITH_ARROW)
 TEST(ArrayViewTest, ArrayViewTestGetIntervalDayTime) {
   struct ArrowArray array;
   struct ArrowSchema schema;