Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com> --- Hi Johannes,
If you need to re-roll your 'js/use-bug-macro' branch, could you please squash this into the relevant patch (commit a86303cb5d, "test-tool: help verifying BUG() code paths", 2018-05-02). This will, obviously, not be required if you were to implement Jeff's suggestion (in [1]) of using an environment variable instead. (which, FWIW, I prefer). Thanks! ATB, Ramsay Jones [1] https://public-inbox.org/git/20180507090109.ga...@sigill.intra.peff.net/ git-compat-util.h | 3 +++ t/helper/test-tool.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/git-compat-util.h b/git-compat-util.h index 5a5a99af7..b7883b257 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -1116,6 +1116,9 @@ static inline int regexec_buf(const regex_t *preg, const char *buf, size_t size, #define HAVE_VARIADIC_MACROS 1 #endif +/* usage.c: only to be used for testing BUG() implementation (see test-tool) */ +extern int BUG_exit_code; + #ifdef HAVE_VARIADIC_MACROS __attribute__((format (printf, 3, 4))) NORETURN void BUG_fl(const char *file, int line, const char *fmt, ...); diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c index 5176f9f20..805a45de9 100644 --- a/t/helper/test-tool.c +++ b/t/helper/test-tool.c @@ -47,7 +47,6 @@ static struct test_cmd cmds[] = { int cmd_main(int argc, const char **argv) { int i; - extern int BUG_exit_code; BUG_exit_code = 99; if (argc < 2) -- 2.17.0
