From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Aug 2025 15:10:34 +0000 (-0700)
Subject: Merge branch 'ps/meson-clar-decls-fix'
X-Git-Tag: v2.51.0-rc0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4c628f6617ae15b1f2445cf893196748d0488fb;p=thirdparty%2Fgit.git

Merge branch 'ps/meson-clar-decls-fix'

Build fix.

* ps/meson-clar-decls-fix:
  meson: ensure correct "clar-decls.h" header is used
---

c4c628f6617ae15b1f2445cf893196748d0488fb
diff --cc t/meson.build
index 09f3068f98,181b5ec1e9..bbeba1a8d5
--- a/t/meson.build
+++ b/t/meson.build
@@@ -59,9 -49,39 +59,12 @@@ clar_sources += custom_target
  
  clar_unit_tests = executable('unit-tests',
    sources: clar_sources + clar_test_suites,
+   c_args: [
+     '-DGIT_CLAR_DECLS_H="' + clar_decls_h.full_path() + '"',
+   ],
    dependencies: [libgit_commonmain],
  )
 -test('unit-tests', clar_unit_tests)
 -
 -unit_test_programs = [
 -  'unit-tests/t-reftable-basics.c',
 -  'unit-tests/t-reftable-block.c',
 -  'unit-tests/t-reftable-merged.c',
 -  'unit-tests/t-reftable-pq.c',
 -  'unit-tests/t-reftable-readwrite.c',
 -  'unit-tests/t-reftable-record.c',
 -  'unit-tests/t-reftable-stack.c',
 -  'unit-tests/t-reftable-table.c',
 -]
 -
 -foreach unit_test_program : unit_test_programs
 -  unit_test_name = fs.stem(unit_test_program)
 -  unit_test = executable(unit_test_name,
 -    sources: [
 -      'unit-tests/test-lib.c',
 -      'unit-tests/lib-reftable.c',
 -      unit_test_program,
 -    ],
 -    dependencies: [libgit_commonmain],
 -  )
 -  test(unit_test_name, unit_test,
 -    workdir: meson.current_source_dir(),
 -    timeout: 0,
 -  )
 -endforeach
 +test('unit-tests', clar_unit_tests, kwargs: test_kwargs)
  
  subdir('helper')