diff options
author | Lennart Poettering <lennart@poettering.net> | 2023-01-30 18:39:20 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2023-02-01 15:25:44 +0100 |
commit | 951174e4fe3a704e385547a875811723ba00ef7c (patch) | |
tree | d5504e804f328397cfd4954c1704c53793cef6dd /src/journal | |
parent | 74e795ee5506821c3ee590f8ab0a968801422eba (diff) | |
download | systemd-951174e4fe3a704e385547a875811723ba00ef7c.tar.gz |
test-journal-flush: minor modernizations
let's automatically destroy test dirs, instead of manually.
Diffstat (limited to 'src/journal')
-rw-r--r-- | src/journal/test-journal-flush.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c index b78e073ddd..53e479909e 100644 --- a/src/journal/test-journal-flush.c +++ b/src/journal/test-journal-flush.c @@ -11,23 +11,24 @@ #include "macro.h" #include "managed-journal-file.h" #include "path-util.h" +#include "rm-rf.h" #include "string-util.h" +#include "tmpfile-util.h" static void test_journal_flush(int argc, char *argv[]) { _cleanup_(mmap_cache_unrefp) MMapCache *m = NULL; _cleanup_free_ char *fn = NULL; - char dn[] = "/var/tmp/test-journal-flush.XXXXXX"; + _cleanup_(rm_rf_physical_and_freep) char *dn = NULL; ManagedJournalFile *new_journal = NULL; sd_journal *j = NULL; unsigned n = 0; int r; - m = mmap_cache_new(); - assert_se(m != NULL); - assert_se(mkdtemp(dn)); + assert_se(m = mmap_cache_new()); + assert_se(mkdtemp_malloc("/var/tmp/test-journal-flush.XXXXXX", &dn) >= 0); (void) chattr_path(dn, FS_NOCOW_FL, FS_NOCOW_FL, NULL); - fn = path_join(dn, "test.journal"); + assert_se(fn = path_join(dn, "test.journal")); r = managed_journal_file_open(-1, fn, O_CREAT|O_RDWR, 0, 0644, 0, NULL, m, NULL, NULL, &new_journal); assert_se(r >= 0); @@ -68,9 +69,6 @@ static void test_journal_flush(int argc, char *argv[]) { sd_journal_close(j); (void) managed_journal_file_close(new_journal); - - unlink(fn); - assert_se(rmdir(dn) == 0); } int main(int argc, char *argv[]) { |