From 678fbf7eef9e6ef9865c7845ab4b9983f754e208 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 31 Oct 2023 14:46:38 +0900 Subject: [PATCH] tests: make log_tests_skipped() and friend accept format string --- src/shared/tests.c | 12 ------------ src/shared/tests.h | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/shared/tests.c b/src/shared/tests.c index 60e2542634..3882a180c4 100644 --- a/src/shared/tests.c +++ b/src/shared/tests.c @@ -118,18 +118,6 @@ void test_setup_logging(int level) { log_open(); } -int log_tests_skipped(const char *message) { - log_notice("%s: %s, skipping tests.", - program_invocation_short_name, message); - return EXIT_TEST_SKIP; -} - -int log_tests_skipped_errno(int r, const char *message) { - log_notice_errno(r, "%s: %s, skipping tests: %m", - program_invocation_short_name, message); - return EXIT_TEST_SKIP; -} - int write_tmpfile(char *pattern, const char *contents) { _cleanup_close_ int fd = -EBADF; diff --git a/src/shared/tests.h b/src/shared/tests.h index 1baad3e51b..2a6d9d9d30 100644 --- a/src/shared/tests.h +++ b/src/shared/tests.h @@ -28,8 +28,23 @@ int get_testdata_dir(const char *suffix, char **ret); const char* get_catalog_dir(void); bool slow_tests_enabled(void); void test_setup_logging(int level); -int log_tests_skipped(const char *message); -int log_tests_skipped_errno(int r, const char *message); + +#define log_tests_skipped(fmt, ...) \ + ({ \ + log_notice("%s: " fmt ", skipping tests.", \ + program_invocation_short_name, \ + ##__VA_ARGS__); \ + EXIT_TEST_SKIP; \ + }) + +#define log_tests_skipped_errno(error, fmt, ...) \ + ({ \ + log_notice_errno(error, \ + "%s: " fmt ", skipping tests: %m", \ + program_invocation_short_name, \ + ##__VA_ARGS__); \ + EXIT_TEST_SKIP; \ + }) int write_tmpfile(char *pattern, const char *contents);