X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-fileio.c;h=7e7b4ac45d37660f40e69c1296266cb15a4600b8;hb=cb6518345fcc057ca6ed3d037253bb4eeab4d94e;hp=1b998281912543a927ad00fa42997881d291a523;hpb=76082570b8115c3410bac42bb5842ba201dddb76;p=elogind.git diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c index 1b9982819..7e7b4ac45 100644 --- a/src/test/test-fileio.c +++ b/src/test/test-fileio.c @@ -90,7 +90,7 @@ static void test_parse_env_file(void) { assert_se(streq_ptr(a[9], "ten=")); assert_se(a[10] == NULL); - strv_env_clean_log(a, "test"); + strv_env_clean_log(a, NULL, "test"); k = 0; STRV_FOREACH(i, b) { @@ -246,25 +246,25 @@ static void test_status_field(void) { r = get_status_field("/proc/meminfo", "MemTotal:", &p); if (r != -ENOENT) { - assert(r == 0); + assert_se(r == 0); puts(p); assert_se(safe_atollu(p, &total) == 0); } r = get_status_field("/proc/meminfo", "\nBuffers:", &s); if (r != -ENOENT) { - assert(r == 0); + assert_se(r == 0); puts(s); assert_se(safe_atollu(s, &buffers) == 0); } - if (p && t) - assert(buffers < total); + if (p) + assert_se(buffers < total); /* Seccomp should be a good test for field full of zeros. */ r = get_status_field("/proc/meminfo", "\nSeccomp:", &z); if (r != -ENOENT) { - assert(r == 0); + assert_se(r == 0); puts(z); assert_se(safe_atollu(z, &buffers) == 0); } @@ -283,10 +283,10 @@ static void test_capeff(void) { if (r == -ENOENT || r == -EPERM) return; - assert(r == 0); - assert(*capeff); + assert_se(r == 0); + assert_se(*capeff); p = capeff[strspn(capeff, DIGITS "abcdefABCDEF")]; - assert(!p || isspace(p)); + assert_se(!p || isspace(p)); } }