test: allow to set NULL to intro or outro

Addresses https://github.com/systemd/systemd/pull/22338#discussion_r796741033.

diff --git a/src/shared/tests.h b/src/shared/tests.h
index 59448f38f65da39eebc50711f5c8e34d05d9a2e7..ef6acd368e57d6ea725db6af1b22d7838bef6a5d 100644 (file)
--- a/src/shared/tests.h
+++ b/src/shared/tests.h
@@ -110,27 +110,28 @@ static inline int run_test_table(void) {
         return r;
 }
 
-static inline int test_nop(void) {
-        return EXIT_SUCCESS;
-}
-
-#define DEFINE_CUSTOM_TEST_MAIN(log_level, intro, outro) \
-        int main(int argc, char *argv[]) {               \
-                int _r, _q;                              \
-                test_setup_logging(log_level);           \
-                save_argc_argv(argc, argv);              \
-                _r = intro();                            \
-                if (_r == EXIT_SUCCESS)                  \
-                        _r = run_test_table();           \
-                _q = outro();                            \
-                static_destruct();                       \
-                if (_r < 0)                              \
-                        return EXIT_FAILURE;             \
-                if (_r != EXIT_SUCCESS)                  \
-                        return _r;                       \
-                if (_q < 0)                              \
-                        return EXIT_FAILURE;             \
-                return _q;                               \
+#define DEFINE_TEST_MAIN_FULL(log_level, intro, outro)    \
+        int main(int argc, char *argv[]) {                \
+                int (*_intro)(void) = intro;              \
+                int (*_outro)(void) = outro;              \
+                int _r, _q;                               \
+                test_setup_logging(log_level);            \
+                save_argc_argv(argc, argv);               \
+                _r = _intro ? _intro() : EXIT_SUCCESS;    \
+                if (_r == EXIT_SUCCESS)                   \
+                        _r = run_test_table();            \
+                _q = _outro ? _outro() : EXIT_SUCCESS;    \
+                static_destruct();                        \
+                if (_r < 0)                               \
+                        return EXIT_FAILURE;              \
+                if (_r != EXIT_SUCCESS)                   \
+                        return _r;                        \
+                if (_q < 0)                               \
+                        return EXIT_FAILURE;              \
+                return _q;                                \
         }
 
-#define DEFINE_TEST_MAIN(log_level) DEFINE_CUSTOM_TEST_MAIN(log_level, test_nop, test_nop)
+#define DEFINE_TEST_MAIN_WITH_INTRO(log_level, intro)   \
+        DEFINE_TEST_MAIN_FULL(log_level, intro, NULL)
+#define DEFINE_TEST_MAIN(log_level)                     \
+        DEFINE_TEST_MAIN_FULL(log_level, NULL, NULL)

diff --git a/src/test/test-barrier.c b/src/test/test-barrier.c
index b87538806a4e4d647d0b9b97979489ca1c3f4629..bbd7e2bddb907db999a6682c4e6001015148f6c2 100644 (file)
--- a/src/test/test-barrier.c
+++ b/src/test/test-barrier.c
@@ -444,4 +444,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
  }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_INFO, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_INFO, intro);

diff --git a/src/test/test-cgroup-setup.c b/src/test/test-cgroup-setup.c
index 6f93647685734460183700a1843a663dff3cb696..c377ff0a007a737e5e769900fe085526b8f9751d 100644 (file)
--- a/src/test/test-cgroup-setup.c
+++ b/src/test/test-cgroup-setup.c
@@ -71,4 +71,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_DEBUG, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_DEBUG, intro);

diff --git a/src/test/test-chown-rec.c b/src/test/test-chown-rec.c
index 691cfe767f619cd10d3e89b96a1c81491151b063..97711f58b0dbdf6f204b828d87d825bb8025023f 100644 (file)
--- a/src/test/test-chown-rec.c
+++ b/src/test/test-chown-rec.c
@@ -156,4 +156,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_DEBUG, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_DEBUG, intro);

diff --git a/src/test/test-format-table.c b/src/test/test-format-table.c
index 7515a74c12a06cfbf126f33c55c565319fed2c92..1b4963d928c7b50c9bfc443421bfefa42056a6db 100644 (file)
--- a/src/test/test-format-table.c
+++ b/src/test/test-format-table.c
@@ -535,4 +535,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_INFO, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_INFO, intro);

diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
index da5a16b4bcc9375d13804fe9ed6ffa3088b5aa9c..602ce75f9804e7426f787a6077bfeda55291fc07 100644 (file)
--- a/src/test/test-fs-util.c
+++ b/src/test/test-fs-util.c
@@ -973,4 +973,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_INFO, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_INFO, intro);

diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c
index 4dc155d8189a954246d8b27fc49d47423897dadc..dbf762cc0b1f8316c51c26d0ce677034b9d7a0ed 100644 (file)
--- a/src/test/test-hashmap.c
+++ b/src/test/test-hashmap.c
@@ -169,4 +169,4 @@ static int outro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_INFO, intro, outro);
+DEFINE_TEST_MAIN_FULL(LOG_INFO, intro, outro);

diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c
index f540a832bdc0ab70c1f55615a711edec87ab410e..f718689c3a63f162b0289387e0b54a2594a727dc 100644 (file)
--- a/src/test/test-install-root.c
+++ b/src/test/test-install-root.c
@@ -1272,4 +1272,4 @@ static int intro(void) {
 }
 
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_INFO, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_INFO, intro);

diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c
index 554bb206dc48ebb1e03bda211498f0a91236245f..52f6096eee14d127fa9b0d165113e4d82b67a576 100644 (file)
--- a/src/test/test-load-fragment.c
+++ b/src/test/test-load-fragment.c
@@ -970,4 +970,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_INFO, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_INFO, intro);

diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c
index 827d0cf29bd4f65c2c95d4809e67f0f3337fd3f7..a373c5f98c35c088b552b8a79b54434ddabbecb4 100644 (file)
--- a/src/test/test-mountpoint-util.c
+++ b/src/test/test-mountpoint-util.c
@@ -309,4 +309,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_DEBUG, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_DEBUG, intro);

diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c
index 3ec81adf1d317ecb0219507b7fbd41d134419d68..8dea195745776f39d725f4274a35c5e47becb28c 100644 (file)
--- a/src/test/test-namespace.c
+++ b/src/test/test-namespace.c
@@ -228,4 +228,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_INFO, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_INFO, intro);

diff --git a/src/test/test-proc-cmdline.c b/src/test/test-proc-cmdline.c
index 064b4d838f4f5a6586595b75360308705f0ba276..1f43bb3eb0dde95507d82662bb1f47471db950ae 100644 (file)
--- a/src/test/test-proc-cmdline.c
+++ b/src/test/test-proc-cmdline.c
@@ -254,4 +254,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_INFO, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_INFO, intro);

diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index 866193492933ba02afae71a54255706cd9b7e685..7a8adad50c8a0a4165fa6b1aa4ffd48a85c71439 100644 (file)
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -900,4 +900,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_INFO, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_INFO, intro);

diff --git a/src/test/test-sd-hwdb.c b/src/test/test-sd-hwdb.c
index 88992a6c2bc6a13f78a9851dbb18a7fc64536e56..4251e2a80988eb4c802bb25b5579cda09adab9a6 100644 (file)
--- a/src/test/test-sd-hwdb.c
+++ b/src/test/test-sd-hwdb.c
@@ -63,4 +63,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_DEBUG, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_DEBUG, intro);

diff --git a/src/test/test-serialize.c b/src/test/test-serialize.c
index 9aeb6c59202ae9d71d1142aa009844ec8229d946..bcf2e843b0985102ac4e08f1940def4a6c946a8d 100644 (file)
--- a/src/test/test-serialize.c
+++ b/src/test/test-serialize.c
@@ -195,4 +195,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_INFO, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_INFO, intro);

diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c
index f56e7e0167f32a4820607c0454027021b222b26e..5aebcdd9356f612a8b6d22307d139abbe48cc29c 100644 (file)
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@ -125,4 +125,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_DEBUG, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_DEBUG, intro);

diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c
index 2965ee679f41b59465aa17c1edcfa336c12dd849..7f633ab2593b329b4fd2e096a3f0505b4528d51c 100644 (file)
--- a/src/test/test-stat-util.c
+++ b/src/test/test-stat-util.c
@@ -241,4 +241,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_INFO, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_INFO, intro);

diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c
index f21d8b7794713a168abe3cfc038c95c91c56d0e6..554693834bf92dec7d909bd609d473e228b3a5d0 100644 (file)
--- a/src/test/test-time-util.c
+++ b/src/test/test-time-util.c
@@ -607,4 +607,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_INFO, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_INFO, intro);

diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index 6c9f245c7e5543ad6100f1b6387548d083a4016e..cc08a4ae4ba90aeb7de93664d1bbb939a6dd1c97 100644 (file)
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -107,4 +107,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_DEBUG, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_DEBUG, intro);

diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index 1f65407e5f480e7ec12bfd3005dd094a2a191c91..8cd0e0b4a110bd062d27427356a098ab71a6ceec 100644 (file)
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -856,4 +856,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_INFO, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_INFO, intro);

diff --git a/src/test/test-unit-serialize.c b/src/test/test-unit-serialize.c
index 5d39176db2147b486a7ea0bc382184d3a4fa2b9e..3ef15f3b1ee174590295b7386704d02ab46adc45 100644 (file)
--- a/src/test/test-unit-serialize.c
+++ b/src/test/test-unit-serialize.c
@@ -60,4 +60,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_DEBUG, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_DEBUG, intro);

diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
index 1b31d1f852d4123f2831e125ee3752e6782ccecb..7337b81227eb53be3094431e39db69bf131f59fb 100644 (file)
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -236,4 +236,4 @@ static int intro(void) {
         return EXIT_SUCCESS;
 }
 
-DEFINE_CUSTOM_TEST_MAIN(LOG_INFO, intro, test_nop);
+DEFINE_TEST_MAIN_WITH_INTRO(LOG_INFO, intro);