@matheusbsbs / matheus-bagliano / commits / 5247da07b8

meson: ensure correct "clar-decls.h" header is used

The "clar-decls.h" header gets generated by us to extract prototypes of unit test functions from our clar-based tests. This generated file is then written into "t/unit-tests/" and included via "unit-test.h". The intent of all this is that we can keep "-Wmissing-prototype" warnings enabled. If we had that warning disabled, it would be easy to miss in case any of the non-static functions had a typo in its name and thus wasn't picked up by our test case extractor. Including the file directly has a big downside though: if a source tree was built both with our Makefile and with Meson, then the Meson build would include the "clar-decls.h" file from our Makefile. And if those are out of sync we get compiler errors. We already fixed a similar issue in 4771501c0a (meson: ensure correct version-def.h is used, 2025-01-14). Let's do the same and pass the absolute path to "clar-decls.h" via a preprocessor define. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Jul 29, 2025 at 16:10 UTC 5247da07b87ab16e57f67f3071db98c0263c40dd

2 files changed +9 -1

t/meson.build

@@ -49,6 +49,9 @@ clar_sources += custom_target(

50 clar_unit_tests = executable('unit-tests',

51 sources: clar_sources + clar_test_suites,

52 + c_args: [

53 + '-DGIT_CLAR_DECLS_H="' + clar_decls_h.full_path() + '"',

54 + ],

55 dependencies: [libgit_commonmain],

56 )

57 test('unit-tests', clar_unit_tests)

t/unit-tests/unit-test.h

+6 -1

@@ -1,8 +1,13 @@

1 #include "git-compat-util.h"

2 #include "clar/clar.h"

3 -#include "clar-decls.h"

3 #include "strbuf.h"

5 +#ifndef GIT_CLAR_DECLS_H

6 +# include "clar-decls.h"

7 +#else

8 +# include GIT_CLAR_DECLS_H

9 +#endif

10 +

11 #define cl_failf(fmt, ...) do { \

12 char desc[4096]; \

13 snprintf(desc, sizeof(desc), fmt, __VA_ARGS__); \