2

Author: HeartLinked

.github/workflows/test.yml

@@ -110,6 +110,7 @@ jobs:
             runs-on: ubuntu-24.04
             CC: gcc-14
             CXX: g++-14
+            meson-setup-args: -Drest_integration_test=enabled
           - title: AMD64 Windows 2025
             runs-on: windows-2025
             meson-setup-args: --vsenv

ci/scripts/build_iceberg.sh

@@ -47,10 +47,10 @@ fi
 
 cmake "${CMAKE_ARGS[@]}" ${source_dir}
 if is_windows; then
-  cmake --build . --config Release --target install -j
+  cmake --build . --config Release --target install
   ctest --output-on-failure -C Release
 else
-  cmake --build . --target install -j
+  cmake --build . --target install
   ctest --output-on-failure
 fi
 

meson.options

@@ -36,4 +36,12 @@ option(
     description: 'Build rest catalog client',
     value: 'enabled',
 )
+
+option(
+    'rest_integration_test',
+    type: 'feature',
+    description: 'Build integration test for rest catalog',
+    value: 'disabled',
+)
+
 option('tests', type: 'feature', description: 'Build tests', value: 'enabled')

src/iceberg/test/meson.build

@@ -27,7 +27,6 @@ configure_file(
     install_dir: get_option('includedir') / 'iceberg/test',
 )
 
-# Add test utilities subdirectory
 subdir('util')
 
 iceberg_tests = {
@@ -91,17 +90,20 @@ iceberg_tests = {
 }
 
 if get_option('rest').enabled()
-    cpp_httplib_dep = dependency('cpp-httplib')
     iceberg_tests += {
         'rest_catalog_test': {
-            'sources': files(
-                'rest_catalog_test.cc',
-                'rest_json_internal_test.cc',
-                'rest_util_test.cc',
-            ),
-            'dependencies': [iceberg_rest_dep, cpp_httplib_dep],
+            'sources': files('rest_json_internal_test.cc', 'rest_util_test.cc'),
+            'dependencies': [iceberg_rest_dep],
         },
     }
+    if get_option('rest_integration_test').enabled()
+        iceberg_tests += {
+            'rest_integration_test': {
+                'sources': files('rest_catalog_test.cc'),
+                'dependencies': [iceberg_rest_dep],
+            },
+        }
+    endif
 endif
 
 foreach test_name, values : iceberg_tests