diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-05-16 11:35:41 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-05-18 20:11:31 +0200 |
| commit | 627d2bac2477986401400127fb31af33ca0f69b0 (patch) | |
| tree | c2e0593b9a4c2c895fe2dcaa03e240e0513bfbee /src/journal/test-compress.c | |
| parent | c55b280158a5a349adb091bf6c3600d4cf7f8020 (diff) | |
| download | systemd-627d2bac2477986401400127fb31af33ca0f69b0.tar.gz | |
fs-util,test: add helper to remove tempfiles
This simplifies the use of tempfiles in tests and fixes "leaked"
temporary files in test-fileio, test-catalog, test-conf-parser.
Not the whole tree is converted.
Diffstat (limited to 'src/journal/test-compress.c')
| -rw-r--r-- | src/journal/test-compress.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/journal/test-compress.c b/src/journal/test-compress.c index 1fb8a3e2fb..f27a1f88db 100644 --- a/src/journal/test-compress.c +++ b/src/journal/test-compress.c @@ -13,6 +13,7 @@ #include "compress.h" #include "fd-util.h" #include "fileio.h" +#include "fs-util.h" #include "macro.h" #include "path-util.h" #include "random-util.h" @@ -142,8 +143,9 @@ static void test_compress_stream(int compression, const char *srcfile) { _cleanup_close_ int src = -1, dst = -1, dst2 = -1; - char pattern[] = "/tmp/systemd-test.compressed.XXXXXX", - pattern2[] = "/tmp/systemd-test.compressed.XXXXXX"; + _cleanup_(unlink_tempfilep) char + pattern[] = "/tmp/systemd-test.compressed.XXXXXX", + pattern2[] = "/tmp/systemd-test.compressed.XXXXXX"; int r; _cleanup_free_ char *cmd = NULL, *cmd2 = NULL; struct stat st = {}; @@ -195,9 +197,6 @@ static void test_compress_stream(int compression, assert_se(lseek(dst2, 0, SEEK_SET) == 0); r = decompress(dst, dst2, st.st_size - 1); assert_se(r == -EFBIG); - - assert_se(unlink(pattern) == 0); - assert_se(unlink(pattern2) == 0); } #endif |