diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-12-15 23:01:05 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-12-16 00:30:34 -0500 |
| commit | bc854dc7cd051e1e5a6ebcca8084b07168051c6c (patch) | |
| tree | 6281cc6f6a9adf4e6f67b1f8660031156ddf6fe4 /src/test | |
| parent | ad2a035820e0fca29e49816f735bec1fcdabf82a (diff) | |
systemctl: refuse to edit runtime dropins when they already exist in /etc
The check for existing unit files and dropins is unified.
path_join() is updated to not insert duplicate separators.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test-path-util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index 58b456a291..11aa52aaed 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -176,13 +176,13 @@ static void test_path_join(void) { test_join("/root", "/a/b", "/c", "/root/a/b/c"); test_join("/root", "a/b", "c", "/root/a/b/c"); test_join("/root", "/a/b", "c", "/root/a/b/c"); - test_join("/root", "/", "c", "/root//c"); + test_join("/root", "/", "c", "/root/c"); test_join("/root", "/", NULL, "/root/"); test_join(NULL, "/a/b", "/c", "/a/b/c"); test_join(NULL, "a/b", "c", "a/b/c"); test_join(NULL, "/a/b", "c", "/a/b/c"); - test_join(NULL, "/", "c", "//c"); + test_join(NULL, "/", "c", "/c"); test_join(NULL, "/", NULL, "/"); } |