diff options
| author | Luca Boccassi <bluca@debian.org> | 2023-04-25 02:00:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 02:00:56 +0100 |
| commit | 7556f29694d45c7c2d28724fa3c14002358b042f (patch) | |
| tree | 7f39f736b8ed67fb77d9d3a63613f7adcf6d8f8e /src/test/test-fd-util.c | |
| parent | 38fc5e0314c84b0259197f155e6cc8782e4773c7 (diff) | |
| parent | 5b87bccc001be4aed1435b49225e95eabeeed720 (diff) | |
| download | systemd-7556f29694d45c7c2d28724fa3c14002358b042f.tar.gz | |
Merge pull request #27386 from dtardon/test-cleanup
More automatic cleanup in tests
Diffstat (limited to 'src/test/test-fd-util.c')
| -rw-r--r-- | src/test/test-fd-util.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c index c902f83784..20d412f5c6 100644 --- a/src/test/test-fd-util.c +++ b/src/test/test-fd-util.c @@ -30,9 +30,9 @@ TEST(close_many) { int fds[3]; - char name0[] = "/tmp/test-close-many.XXXXXX"; - char name1[] = "/tmp/test-close-many.XXXXXX"; - char name2[] = "/tmp/test-close-many.XXXXXX"; + _cleanup_(unlink_tempfilep) char name0[] = "/tmp/test-close-many.XXXXXX"; + _cleanup_(unlink_tempfilep) char name1[] = "/tmp/test-close-many.XXXXXX"; + _cleanup_(unlink_tempfilep) char name2[] = "/tmp/test-close-many.XXXXXX"; fds[0] = mkostemp_safe(name0); fds[1] = mkostemp_safe(name1); @@ -45,22 +45,16 @@ TEST(close_many) { assert_se(fcntl(fds[2], F_GETFD) >= 0); safe_close(fds[2]); - - unlink(name0); - unlink(name1); - unlink(name2); } TEST(close_nointr) { - char name[] = "/tmp/test-test-close_nointr.XXXXXX"; + _cleanup_(unlink_tempfilep) char name[] = "/tmp/test-test-close_nointr.XXXXXX"; int fd; fd = mkostemp_safe(name); assert_se(fd >= 0); assert_se(close_nointr(fd) >= 0); assert_se(close_nointr(fd) < 0); - - unlink(name); } TEST(same_fd) { |