summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test-acl-util.c2
-rw-r--r--src/test/test-async.c2
-rw-r--r--src/test/test-chown-rec.c2
-rw-r--r--src/test/test-clock.c1
-rw-r--r--src/test/test-conf-parser.c2
-rw-r--r--src/test/test-copy.c1
-rw-r--r--src/test/test-dev-setup.c2
-rw-r--r--src/test/test-fd-util.c3
-rw-r--r--src/test/test-fdset.c2
-rw-r--r--src/test/test-fileio.c1
-rw-r--r--src/test/test-fs-util.c2
-rw-r--r--src/test/test-glob-util.c2
-rw-r--r--src/test/test-hostname-util.c1
-rw-r--r--src/test/test-id128.c2
-rw-r--r--src/test/test-serialize.c1
-rw-r--r--src/test/test-socket-util.c4
-rw-r--r--src/test/test-stat-util.c4
-rw-r--r--src/test/test-terminal-util.c4
-rw-r--r--src/test/test-tmpfiles.c1
-rw-r--r--src/test/test-unit-file.c3
-rw-r--r--src/test/test-xattr-util.c2
21 files changed, 26 insertions, 18 deletions
diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c
index a8d413533e..df879747f5 100644
--- a/src/test/test-acl-util.c
+++ b/src/test/test-acl-util.c
@@ -7,8 +7,8 @@
#include "acl-util.h"
#include "fd-util.h"
-#include "fileio.h"
#include "string-util.h"
+#include "tmpfile-util.h"
#include "user-util.h"
static void test_add_acls_for_user(void) {
diff --git a/src/test/test-async.c b/src/test/test-async.c
index 183f2be234..4f5307889e 100644
--- a/src/test/test-async.c
+++ b/src/test/test-async.c
@@ -3,8 +3,8 @@
#include <unistd.h>
#include "async.h"
-#include "fileio.h"
#include "macro.h"
+#include "tmpfile-util.h"
#include "util.h"
static bool test_async = false;
diff --git a/src/test/test-chown-rec.c b/src/test/test-chown-rec.c
index f635b4ff92..305d44f568 100644
--- a/src/test/test-chown-rec.c
+++ b/src/test/test-chown-rec.c
@@ -4,11 +4,11 @@
#include "alloc-util.h"
#include "chown-recursive.h"
-#include "fileio.h"
#include "log.h"
#include "rm-rf.h"
#include "string-util.h"
#include "tests.h"
+#include "tmpfile-util.h"
static const uint8_t acl[] = {
0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x07, 0x00,
diff --git a/src/test/test-clock.c b/src/test/test-clock.c
index f5b9a72727..018e679b45 100644
--- a/src/test/test-clock.c
+++ b/src/test/test-clock.c
@@ -12,6 +12,7 @@
#include "fs-util.h"
#include "log.h"
#include "macro.h"
+#include "tmpfile-util.h"
static void test_clock_is_localtime(void) {
_cleanup_(unlink_tempfilep) char adjtime[] = "/tmp/test-adjtime.XXXXXX";
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index 497becff73..2921338f62 100644
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -2,12 +2,12 @@
#include "conf-parser.h"
#include "fd-util.h"
-#include "fileio.h"
#include "fs-util.h"
#include "log.h"
#include "macro.h"
#include "string-util.h"
#include "strv.h"
+#include "tmpfile-util.h"
#include "util.h"
static void test_config_parse_path_one(const char *rvalue, const char *expected) {
diff --git a/src/test/test-copy.c b/src/test/test-copy.c
index 4e265374ab..b17a1c53fe 100644
--- a/src/test/test-copy.c
+++ b/src/test/test-copy.c
@@ -15,6 +15,7 @@
#include "string-util.h"
#include "strv.h"
#include "tests.h"
+#include "tmpfile-util.h"
#include "user-util.h"
#include "util.h"
diff --git a/src/test/test-dev-setup.c b/src/test/test-dev-setup.c
index 523cfe43b1..9414ea6c3e 100644
--- a/src/test/test-dev-setup.c
+++ b/src/test/test-dev-setup.c
@@ -2,10 +2,10 @@
#include "capability-util.h"
#include "dev-setup.h"
-#include "fileio.h"
#include "fs-util.h"
#include "path-util.h"
#include "rm-rf.h"
+#include "tmpfile-util.h"
int main(int argc, char *argv[]) {
_cleanup_(rm_rf_physical_and_freep) char *p = NULL;
diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c
index 157dc88320..a9ecfb6bfe 100644
--- a/src/test/test-fd-util.c
+++ b/src/test/test-fd-util.c
@@ -11,8 +11,9 @@
#include "process-util.h"
#include "random-util.h"
#include "string-util.h"
-#include "util.h"
#include "tests.h"
+#include "tmpfile-util.h"
+#include "util.h"
static void test_close_many(void) {
int fds[3];
diff --git a/src/test/test-fdset.c b/src/test/test-fdset.c
index 7d68a6b966..fb9d397569 100644
--- a/src/test/test-fdset.c
+++ b/src/test/test-fdset.c
@@ -5,8 +5,8 @@
#include "fd-util.h"
#include "fdset.h"
-#include "fileio.h"
#include "macro.h"
+#include "tmpfile-util.h"
#include "util.h"
static void test_fdset_new_fill(void) {
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index de95a1433f..da536fe5ab 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -16,6 +16,7 @@
#include "string-util.h"
#include "strv.h"
#include "tests.h"
+#include "tmpfile-util.h"
#include "util.h"
static void test_parse_env_file(void) {
diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
index d5f652c938..4962471141 100644
--- a/src/test/test-fs-util.c
+++ b/src/test/test-fs-util.c
@@ -5,7 +5,6 @@
#include "alloc-util.h"
#include "fd-util.h"
#include "fd-util.h"
-#include "fileio.h"
#include "fs-util.h"
#include "id128-util.h"
#include "macro.h"
@@ -16,6 +15,7 @@
#include "string-util.h"
#include "strv.h"
#include "tests.h"
+#include "tmpfile-util.h"
#include "user-util.h"
#include "util.h"
#include "virt.h"
diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
index d78d6223c0..b4f41445fe 100644
--- a/src/test/test-glob-util.c
+++ b/src/test/test-glob-util.c
@@ -7,11 +7,11 @@
#include "alloc-util.h"
#include "dirent-util.h"
-#include "fileio.h"
#include "fs-util.h"
#include "glob-util.h"
#include "macro.h"
#include "rm-rf.h"
+#include "tmpfile-util.h"
static void test_glob_exists(void) {
char name[] = "/tmp/test-glob_exists.XXXXXX";
diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c
index 194a640eee..8ba47d316b 100644
--- a/src/test/test-hostname-util.c
+++ b/src/test/test-hostname-util.c
@@ -4,6 +4,7 @@
#include "fileio.h"
#include "hostname-util.h"
#include "string-util.h"
+#include "tmpfile-util.h"
#include "util.h"
static void test_hostname_is_valid(void) {
diff --git a/src/test/test-id128.c b/src/test/test-id128.c
index e3d07a69f3..ec50e057a3 100644
--- a/src/test/test-id128.c
+++ b/src/test/test-id128.c
@@ -7,10 +7,10 @@
#include "alloc-util.h"
#include "fd-util.h"
-#include "fileio.h"
#include "id128-util.h"
#include "macro.h"
#include "string-util.h"
+#include "tmpfile-util.h"
#include "util.h"
#define ID128_WALDI SD_ID128_MAKE(01, 02, 03, 04, 05, 06, 07, 08, 09, 0a, 0b, 0c, 0d, 0e, 0f, 10)
diff --git a/src/test/test-serialize.c b/src/test/test-serialize.c
index e306b1f1d6..a57d5db2b1 100644
--- a/src/test/test-serialize.c
+++ b/src/test/test-serialize.c
@@ -8,6 +8,7 @@
#include "serialize.h"
#include "strv.h"
#include "tests.h"
+#include "tmpfile-util.h"
char long_string[LONG_LINE_MAX+1];
diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c
index 349d866442..f902f500e0 100644
--- a/src/test/test-socket-util.c
+++ b/src/test/test-socket-util.c
@@ -9,7 +9,6 @@
#include "escape.h"
#include "exit-status.h"
#include "fd-util.h"
-#include "fileio.h"
#include "in-addr-util.h"
#include "io-util.h"
#include "log.h"
@@ -17,8 +16,9 @@
#include "process-util.h"
#include "socket-util.h"
#include "string-util.h"
-#include "util.h"
#include "tests.h"
+#include "tmpfile-util.h"
+#include "util.h"
static void test_ifname_valid(void) {
log_info("/* %s */", __func__);
diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c
index 3487ac785d..d16fdd90d1 100644
--- a/src/test/test-stat-util.c
+++ b/src/test/test-stat-util.c
@@ -6,12 +6,12 @@
#include "alloc-util.h"
#include "fd-util.h"
-#include "fileio.h"
#include "macro.h"
#include "missing.h"
#include "mountpoint-util.h"
-#include "stat-util.h"
#include "path-util.h"
+#include "stat-util.h"
+#include "tmpfile-util.h"
static void test_files_same(void) {
_cleanup_close_ int fd = -1;
diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c
index 7edf7681c2..958d369430 100644
--- a/src/test/test-terminal-util.c
+++ b/src/test/test-terminal-util.c
@@ -5,11 +5,11 @@
#include "alloc-util.h"
#include "fd-util.h"
-#include "fileio.h"
-#include "tests.h"
#include "macro.h"
#include "strv.h"
#include "terminal-util.h"
+#include "tests.h"
+#include "tmpfile-util.h"
#include "util.h"
static void test_default_term_for_tty(void) {
diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c
index 7f288e54ce..b526871655 100644
--- a/src/test/test-tmpfiles.c
+++ b/src/test/test-tmpfiles.c
@@ -14,6 +14,7 @@
#include "process-util.h"
#include "string-util.h"
#include "tests.h"
+#include "tmpfile-util.h"
#include "util.h"
int main(int argc, char** argv) {
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index 493ca50220..b1aa387110 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -7,8 +7,8 @@
#include <sys/capability.h>
#include <unistd.h>
-#include "alloc-util.h"
#include "all-units.h"
+#include "alloc-util.h"
#include "capability-util.h"
#include "conf-parser.h"
#include "fd-util.h"
@@ -26,6 +26,7 @@
#include "strv.h"
#include "test-helper.h"
#include "tests.h"
+#include "tmpfile-util.h"
#include "user-util.h"
#include "util.h"
diff --git a/src/test/test-xattr-util.c b/src/test/test-xattr-util.c
index 2d93e65be2..3e6df96c5d 100644
--- a/src/test/test-xattr-util.c
+++ b/src/test/test-xattr-util.c
@@ -8,11 +8,11 @@
#include "alloc-util.h"
#include "fd-util.h"
-#include "fileio.h"
#include "fs-util.h"
#include "macro.h"
#include "string-util.h"
#include "tests.h"
+#include "tmpfile-util.h"
#include "xattr-util.h"
static void test_fgetxattrat_fake(void) {
View Lorry Controller Status