39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From bcb1eadc0cf8053d219c0b2cab1c46235506981d Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Tue, 28 Jan 2020 21:40:03 +0100
|
|
Subject: [PATCH 1481/1760] test: fix rename_noreplace() test
|
|
|
|
This corrects the fix b81b9d406de, making the test operate like it was
|
|
originally.
|
|
Reference: https://github.com/systemd/systemd/commit/bcb1eadc0cf8053d219c0b2cab1c46235506981d
|
|
Conflict: NA
|
|
---
|
|
src/test/test-fs-util.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
|
|
index 1a5fd56..d0c6fb8 100644
|
|
--- a/src/test/test-fs-util.c
|
|
+++ b/src/test/test-fs-util.c
|
|
@@ -739,7 +739,7 @@ static void test_rename_noreplace(void) {
|
|
STRV_FOREACH(b, (char**) table) {
|
|
_cleanup_free_ char *w = NULL;
|
|
|
|
- w = strjoin(w, *b);
|
|
+ w = strjoin(z, *b);
|
|
assert_se(w);
|
|
|
|
if (access(w, F_OK) < 0) {
|
|
@@ -747,7 +747,7 @@ static void test_rename_noreplace(void) {
|
|
continue;
|
|
}
|
|
|
|
- assert_se(rename_noreplace(AT_FDCWD, w, AT_FDCWD, y) == -EEXIST);
|
|
+ assert_se(rename_noreplace(AT_FDCWD, x, AT_FDCWD, w) == -EEXIST);
|
|
}
|
|
|
|
y = strjoin(z, "/somethingelse");
|
|
--
|
|
1.8.3.1
|
|
|