tests: make log_tests_skipped() and friend accept format string

diff --git a/src/shared/tests.c b/src/shared/tests.c
index 60e25426343f21cb0902e3cb44c4d38425f44299..3882a180c4ada07d7dbc251b422fc91b58be74e3 100644 (file)
--- 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 1baad3e51bb6b2e83f3632de5d584f148aa521b1..2a6d9d9d307a7839798bd5ca65e4b85b127e5b00 100644 (file)
--- 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);