diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-11-13 16:36:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-13 16:36:39 +0100 |
| commit | c214e210c934d331afb6dccdf478c5dd155501b5 (patch) | |
| tree | d308efba195d5a34f43257b6e8c9c35b84e2189b /src/test/test-unit-name.c | |
| parent | Merge pull request #13868 from keszybz/run-exit-code (diff) | |
| parent | test-bpf-devices: skip test on !unified (diff) | |
| download | systemd-c214e210c934d331afb6dccdf478c5dd155501b5.tar.xz systemd-c214e210c934d331afb6dccdf478c5dd155501b5.zip | |
Merge pull request #13994 from keszybz/bpf-refactor
Refactor the bpf devices code and fix some bugs
Diffstat (limited to 'src/test/test-unit-name.c')
| -rw-r--r-- | src/test/test-unit-name.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index 986fcbb1af..5d18711a5e 100644 --- a/src/test/test-unit-name.c +++ b/src/test/test-unit-name.c @@ -15,7 +15,6 @@ #include "special.h" #include "specifier.h" #include "string-util.h" -#include "test-helper.h" #include "tests.h" #include "unit-def.h" #include "unit-name.h" @@ -234,7 +233,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); @@ -871,7 +870,7 @@ int main(int argc, char* argv[]) { test_setup_logging(LOG_INFO); - r = enter_cgroup_subroot(); + r = enter_cgroup_subroot(NULL); if (r == -ENOMEDIUM) return log_tests_skipped("cgroupfs not available"); |