modify meson

Author: HeartLinked

meson.build

@@ -30,6 +30,10 @@ project(
     ],
 )
 
+cpp = meson.get_compiler('cpp')
+args = cpp.get_supported_arguments(['/bigobj'])
+add_project_arguments(args, language: 'cpp')
+
 subdir('src')
 
 install_data(

src/iceberg/test/meson.build

@@ -96,12 +96,6 @@ if get_option('rest').enabled()
     }
 endif
 
-cpp = meson.get_compiler('cpp')
-cpp_bigobj_args = []
-if cpp.get_id() == 'msvc'
-    cpp_bigobj_args += cpp.get_supported_arguments(['/bigobj'])
-endif
-
 foreach test_name, values : iceberg_tests
     exc = executable(
         test_name,
@@ -110,7 +104,6 @@ foreach test_name, values : iceberg_tests
             'dependencies',
             [],
         ),
-        cpp_args: cpp_bigobj_args,
     )
     test(test_name, exc)
 endforeach

src/iceberg/test/rest_json_internal_test.cc

@@ -770,8 +770,8 @@ INSTANTIATE_TEST_SUITE_P(
             .test_name = "FullConfig",
             .expected_json_str =
                 R"({"defaults":{"warehouse":"s3://bucket/warehouse"},"overrides":{"clients":"5"}})",
-            .model = {.overrides = {{"clients", "5"}},
-                      .defaults = {{"warehouse", "s3://bucket/warehouse"}}}},
+            .model = {.defaults = {{"warehouse", "s3://bucket/warehouse"}},
+                      .overrides = {{"clients", "5"}}}},
         // Only defaults
         CatalogConfigParam{
             .test_name = "OnlyDefaults",
@@ -792,8 +792,9 @@ INSTANTIATE_TEST_SUITE_P(
             .test_name = "WithEndpoints",
             .expected_json_str =
                 R"({"defaults":{"warehouse":"s3://bucket/warehouse"},"overrides":{"clients":"5"},"endpoints":["GET /v1/config","POST /v1/tables"]})",
-            .model = {.overrides = {{"clients", "5"}},
-                      .defaults = {{"warehouse", "s3://bucket/warehouse"}},
+            .model = {.defaults = {{"warehouse", "s3://bucket/warehouse"}},
+                      .overrides = {{"clients", "5"}},
+
                       .endpoints = {"GET /v1/config", "POST /v1/tables"}}},
         // Only endpoints
         CatalogConfigParam{