(arrow) branch main updated: GH-45771: [C++] Add tests to top level Meson configuration (#45773)

[kou]

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new ab4263476d GH-45771: [C++] Add tests to top level Meson configuration 
(#45773)
ab4263476d is described below

commit ab4263476d9d5078cd0fa2cce6b922eb7d90c0af
Author: William Ayd <william....@icloud.com>
AuthorDate: Fri Mar 14 02:59:17 2025 -0400

    GH-45771: [C++] Add tests to top level Meson configuration (#45773)
    
    ### Rationale for this change
    
    This continues adding support to the Meson configuration by adding top 
level tests that are currently present in CMake
    
    ### What changes are included in this PR?
    
    This adds tests and fixes a small bug with the Meson configuration file 
that generated an incorrect Arrow version
    
    ### Are these changes tested?
    
    Yes
    
    ### Are there any user-facing changes?
    
    No
    * GitHub Issue: #45771
    
    Authored-by: Will Ayd <william....@icloud.com>
    Signed-off-by: Sutou Kouhei <k...@clear-code.com>
---
 cpp/src/arrow/meson.build      | 76 ++++++++++++++++++++++++++++++++----------
 cpp/src/arrow/util/meson.build |  1 -
 2 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/cpp/src/arrow/meson.build b/cpp/src/arrow/meson.build
index 732d20d0cd..3a538ca2b2 100644
--- a/cpp/src/arrow/meson.build
+++ b/cpp/src/arrow/meson.build
@@ -390,24 +390,64 @@ arrow_test_dep = declare_dependency(
     dependencies: [arrow_dep, filesystem_dep, gmock_dep, gtest_main_dep],
 )
 
-array_array_test = executable(
-    'arrow_array_test',
-    sources: [
-        'array/array_test.cc',
-        'array/array_binary_test.cc',
-        'array/array_dict_test.cc',
-        'array/array_list_test.cc',
-        'array/array_list_view_test.cc',
-        'array/array_run_end_test.cc',
-        'array/array_struct_test.cc',
-        'array/array_union_test.cc',
-        'array/array_view_test.cc',
-        'array/statistics_test.cc',
-    ],
-    dependencies: [arrow_test_dep],
-)
+arrow_tests = {
+    'arrow-array-test': {
+        'sources': [
+            'array/array_test.cc',
+            'array/array_binary_test.cc',
+            'array/array_dict_test.cc',
+            'array/array_list_test.cc',
+            'array/array_list_view_test.cc',
+            'array/array_run_end_test.cc',
+            'array/array_struct_test.cc',
+            'array/array_union_test.cc',
+            'array/array_view_test.cc',
+            'array/statistics_test.cc',
+        ],
+    },
+    'arrow-buffer-test': {'sources': ['buffer_test.cc']},
+    'arrow-misc-test': {
+        'sources': [
+            'datum_test.cc',
+            'memory_pool_test.cc',
+            'result_test.cc',
+            'pretty_print_test.cc',
+            'status_test.cc',
+        ],
+    },
+    'arrow-public-api-test': {'sources': ['public_api_test.cc']},
+    'arrow-scalar-test': {'sources': ['scalar_test.cc']},
+    'arrow-type-test': {'sources': ['field_ref_test.cc', 'type_test.cc']},
+    'arrow-table-test': {
+        'sources': [
+            'chunked_array_test.cc',
+            'record_batch_test.cc',
+            'table_test.cc',
+            'table_builder_test.cc',
+        ],
+    },
+    'arrow-tensor-test': {'sources': ['tensor_test.cc']},
+    'arrow-sparse-tensor-test': {'sources': ['sparse_tensor_test.cc']},
+    'arrow-stl-test': {'sources': ['stl_iterator_test.cc', 'stl_test.cc']},
+}
 
-test('arrow_array_test', array_array_test)
+if needs_ipc
+    arrow_tests += {
+        'arrow-extension-type-test': {
+            'sources': ['extension_type_test.cc'],
+            'dependencies': [arrow_ipc_deps],
+        },
+    }
+endif
+
+foreach key, val : arrow_tests
+    exc = executable(
+        key,
+        sources: val['sources'],
+        dependencies: [arrow_test_dep, val.get('dependencies', [])],
+    )
+    test(key, exc)
+endforeach
 
 version = meson.project_version()
 
@@ -421,7 +461,7 @@ version_major = components[0]
 version_minor = components[1]
 version_patch = components[2]
 
-arrow_version = (version_major.to_int() * 1000 + version_minor.to_int()) * 
1000 + version_patch.to_int()
+arrow_version = '@0@.@1@.@2@'.format(version_major, version_minor, 
version_patch)
 arrow_so_version = (version_major.to_int() * 100 + 
version_minor.to_int()).to_string()
 arrow_full_so_version = '@0@.@1@.@2@'.format(arrow_so_version, version_patch, 
0)
 
diff --git a/cpp/src/arrow/util/meson.build b/cpp/src/arrow/util/meson.build
index 8105df958e..016ef06a08 100644
--- a/cpp/src/arrow/util/meson.build
+++ b/cpp/src/arrow/util/meson.build
@@ -22,7 +22,6 @@ conf_data.set('ARROW_VERSION_MINOR', version_minor)
 conf_data.set('ARROW_VERSION_PATCH', version_patch)
 
 conf_data.set('ARROW_VERSION', arrow_version)
-conf_data.set('ARROW_VERSION_STRING', arrow_version)
 
 conf_data.set('ARROW_SO_VERSION', arrow_so_version)
 conf_data.set('ARROW_FULL_SO_VERSION', arrow_full_so_version)