tests: make manager_skip_test() not a macro and move to tests.h

There is nothing magic in it.

diff --git a/src/shared/tests.h b/src/shared/tests.h
index 8416b107f3a6c57039e614065e147348a2278064..72f6f63651c8c11f97079017e80c8b8b05c174ca 100644 (file)
--- a/src/shared/tests.h
+++ b/src/shared/tests.h
@@ -3,6 +3,19 @@
 
 #include <stdbool.h>
 
+#include "macro.h"
+
+static inline bool manager_errno_skip_test(int r) {
+        return IN_SET(abs(r),
+                      EPERM,
+                      EACCES,
+                      EADDRINUSE,
+                      EHOSTDOWN,
+                      ENOENT,
+                      ENOMEDIUM /* cannot determine cgroup */
+        );
+}
+
 char* setup_fake_runtime_dir(void);
 const char* get_testdata_dir(void);
 const char* get_catalog_dir(void);

diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index 265152fb76e83d9301de74798fd9c75d3da94a2d..c292ad1c7c48727e257bb029fe9295dd64705bc6 100644 (file)
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -30,7 +30,7 @@ int main(int argc, char *argv[]) {
         assert_se(set_unit_path(get_testdata_dir()) >= 0);
         assert_se(runtime_dir = setup_fake_runtime_dir());
         r = manager_new(UNIT_FILE_USER, MANAGER_TEST_RUN_BASIC, &m);
-        if (MANAGER_SKIP_TEST(r))
+        if (manager_errno_skip_test(r))
                 return log_tests_skipped_errno(r, "manager_new");
         assert_se(r >= 0);
         assert_se(manager_startup(m, NULL, NULL) >= 0);

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 92fb35fd8772018c9841fe8fe1e8c9d17d3e56eb..57a4b1c28247c6a161ce7776497a7a5911f0831f 100644 (file)
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -781,7 +781,7 @@ static int run_tests(UnitFileScope scope, const test_entry tests[], char **patte
         assert_se(tests);
 
         r = manager_new(scope, MANAGER_TEST_RUN_BASIC, &m);
-        if (MANAGER_SKIP_TEST(r))
+        if (manager_errno_skip_test(r))
                 return log_tests_skipped_errno(r, "manager_new");
         assert_se(r >= 0);
         assert_se(manager_startup(m, NULL, NULL) >= 0);

diff --git a/src/test/test-helper.h b/src/test/test-helper.h
index 77af40d55597a4dc73f71172b49256c31b1aed86..81e19ee2071c3192eeaeec8aec87f1731917f5cb 100644 (file)
--- a/src/test/test-helper.h
+++ b/src/test/test-helper.h
@@ -5,9 +5,9 @@
   Copyright © 2013 Holger Hans Peter Freyther
 ***/
 
-#include "sd-daemon.h"
+#include <stdbool.h>
 
-#include "macro.h"
+#include "sd-daemon.h"
 
 #define TEST_REQ_RUNNING_SYSTEMD(x)                                 \
         if (sd_booted() > 0) {                                      \
@@ -16,16 +16,6 @@
                 printf("systemd not booted skipping '%s'\n", #x);   \
         }
 
-#define MANAGER_SKIP_TEST(r)                                    \
-        IN_SET(r,                                               \
-               -EPERM,                                          \
-               -EACCES,                                         \
-               -EADDRINUSE,                                     \
-               -EHOSTDOWN,                                      \
-               -ENOENT,                                         \
-               -ENOMEDIUM /* cannot determine cgroup */         \
-               )
-
 int enter_cgroup_subroot(void);
 
 bool is_run_on_travis_ci(void);

diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c
index 216f0e4d944de5987bf524faafc8e5a596e26648..cb808bfce0172d946b3e2d2d7b671206d95b003c 100644 (file)
--- a/src/test/test-load-fragment.c
+++ b/src/test/test-load-fragment.c
@@ -97,7 +97,7 @@ static void test_config_parse_exec(void) {
         _cleanup_(unit_freep) Unit *u = NULL;
 
         r = manager_new(UNIT_FILE_USER, MANAGER_TEST_RUN_MINIMAL, &m);
-        if (MANAGER_SKIP_TEST(r)) {
+        if (manager_errno_skip_test(r)) {
                 log_notice_errno(r, "Skipping test: manager_new: %m");
                 return;
         }
@@ -442,7 +442,7 @@ static void test_config_parse_log_extra_fields(void) {
         ExecContext c = {};
 
         r = manager_new(UNIT_FILE_USER, MANAGER_TEST_RUN_MINIMAL, &m);
-        if (MANAGER_SKIP_TEST(r)) {
+        if (manager_errno_skip_test(r)) {
                 log_notice_errno(r, "Skipping test: manager_new: %m");
                 return;
         }

diff --git a/src/test/test-path.c b/src/test/test-path.c
index 07a0e413ee357db9e9e204ceac796e40172282a4..9157c6a13bf13f30840cbbab1242397da670eebf 100644 (file)
--- a/src/test/test-path.c
+++ b/src/test/test-path.c
@@ -37,7 +37,7 @@ static int setup_test(Manager **m) {
                 return log_tests_skipped("cgroupfs not available");
 
         r = manager_new(UNIT_FILE_USER, MANAGER_TEST_RUN_BASIC, &tmp);
-        if (MANAGER_SKIP_TEST(r))
+        if (manager_errno_skip_test(r))
                 return log_tests_skipped_errno(r, "manager_new");
         assert_se(r >= 0);
         assert_se(manager_startup(tmp, NULL, NULL) >= 0);

diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c
index 1aa178182bffb482068d1c374d85b09f1736fad9..d179ae21a60d1935f99184741389110550822b05 100644 (file)
--- a/src/test/test-sched-prio.c
+++ b/src/test/test-sched-prio.c
@@ -29,7 +29,7 @@ int main(int argc, char *argv[]) {
         assert_se(set_unit_path(get_testdata_dir()) >= 0);
         assert_se(runtime_dir = setup_fake_runtime_dir());
         r = manager_new(UNIT_FILE_USER, MANAGER_TEST_RUN_BASIC, &m);
-        if (MANAGER_SKIP_TEST(r))
+        if (manager_errno_skip_test(r))
                 return log_tests_skipped_errno(r, "manager_new");
         assert_se(r >= 0);
         assert_se(manager_startup(m, NULL, NULL) >= 0);

diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index c9bbce0d2e43ae85ba8ed3b5354353dfd467b0ad..52c75406ae83740d13fc7285dd35fc18243a54c2 100644 (file)
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -209,7 +209,7 @@ static int test_unit_printf(void) {
         assert_se(get_shell(&shell) >= 0);
 
         r = manager_new(UNIT_FILE_USER, MANAGER_TEST_RUN_MINIMAL, &m);
-        if (MANAGER_SKIP_TEST(r))
+        if (manager_errno_skip_test(r))
                 return log_tests_skipped_errno(r, "manager_new");
         assert_se(r == 0);