summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2023-06-01 13:42:39 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2023-06-06 14:42:03 +0200
commitf9f70e062da2557a1127dbd584c7dfae7defe149 (patch)
tree8ccf9aa315df45320f399f53a1ab90d9535d6786 /src/test
parenttests: fix shellcheck warnings (diff)
downloadsystemd-f9f70e062da2557a1127dbd584c7dfae7defe149.tar.xz
systemd-f9f70e062da2557a1127dbd584c7dfae7defe149.zip
copy: Merge copy_directory() and copy_directory_fd() into copy_directory_at()
Let's merge these two into a single function that can handle both variants and more.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test-execute.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index a07c837e3f..a63afa873b 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -1299,7 +1299,7 @@ static int prepare_ns(const char *process_name) {
/* Copy unit files to make them accessible even when unprivileged. */
assert_se(get_testdata_dir("test-execute/", &unit_dir) >= 0);
- assert_se(copy_directory(unit_dir, PRIVATE_UNIT_DIR, COPY_MERGE_EMPTY) >= 0);
+ assert_se(copy_directory_at(AT_FDCWD, unit_dir, AT_FDCWD, PRIVATE_UNIT_DIR, COPY_MERGE_EMPTY) >= 0);
/* Prepare credstore like tmpfiles.d/credstore.conf for LoadCredential= tests. */
FOREACH_STRING(p, "/run/credstore", "/run/credstore.encrypted") {