X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-unit-name.c;h=256e820c224ee85c5c5f688a5b3142515800885f;hb=9833a66c7eba011c3740867c80133bc6fa976aa3;hp=b7331737427be0d51892ba3f70ee6a4488b46ac6;hpb=0d8c31ff7237149b505290652864b4e7e866b2a7;p=elogind.git diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index b73317374..256e820c2 100644 --- a/src/test/test-unit-name.c +++ b/src/test/test-unit-name.c @@ -43,7 +43,7 @@ static void test_replacements(void) { _cleanup_free_ char *t = \ unit_name_replace_instance(pattern, repl); \ puts(t); \ - assert(streq(t, expected)); \ + assert_se(streq(t, expected)); \ } expect("foo@.service", "waldo", "foo@waldo.service"); @@ -64,7 +64,7 @@ static void test_replacements(void) { puts(t); \ k = unit_name_to_path(t); \ puts(k); \ - assert(streq(k, expected ? expected : path)); \ + assert_se(streq(k, expected ? expected : path)); \ } expect("/waldo", ".mount", NULL); @@ -80,7 +80,7 @@ static void test_replacements(void) { _cleanup_free_ char *t = \ unit_name_from_path_instance(pattern, path, suffix); \ puts(t); \ - assert(streq(t, expected)); \ + assert_se(streq(t, expected)); \ } expect("waldo", "/waldo", ".mount", "waldo@waldo.mount"); @@ -130,7 +130,7 @@ static int test_unit_printf(void) { puts("manager_new: Permission denied. Skipping test."); return EXIT_TEST_SKIP; } - assert(r == 0); + assert_se(r == 0); #define expect(unit, pattern, expected) \ { \ @@ -139,9 +139,9 @@ static int test_unit_printf(void) { assert_se(unit_full_printf(unit, pattern, &t) >= 0); \ printf("result: %s\nexpect: %s\n", t, expected); \ if ((e = endswith(expected, "*"))) \ - assert(strncmp(t, e, e-expected)); \ + assert_se(strncmp(t, e, e-expected)); \ else \ - assert(streq(t, expected)); \ + assert_se(streq(t, expected)); \ } assert_se(setenv("USER", "root", 1) == 0);