X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-path-util.c;h=82090ce99f51d4d9b7c45e2d388938c492783c8b;hp=0aa0bf1354bba829b4801832f979427cc3230762;hb=adeba5008eac3105ae59256dedd087ebe006a9e6;hpb=7f076504b8291d03063ccaee5b40f642df48f8b1 diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index 0aa0bf135..82090ce99 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -20,10 +20,12 @@ ***/ #include +#include #include "path-util.h" #include "util.h" #include "macro.h" +#include "strv.h" static void test_path(void) { @@ -56,7 +58,7 @@ static void test_path(void) { assert_se(streq(basename("file.../"), "")); #define test_parent(x, y) { \ - char _cleanup_free_ *z = NULL; \ + _cleanup_free_ char *z = NULL; \ int r = path_get_parent(x, &z); \ printf("expected: %s\n", y ? y : "error"); \ printf("actual: %s\n", r<0 ? "error" : z); \ @@ -77,35 +79,35 @@ static void test_path(void) { char p2[] = "//aaa/.////ccc"; char p3[] = "/./"; - assert(path_equal(path_kill_slashes(p1), "aaa/bbb/ccc")); - assert(path_equal(path_kill_slashes(p2), "/aaa/./ccc")); - assert(path_equal(path_kill_slashes(p3), "/./")); + assert_se(path_equal(path_kill_slashes(p1), "aaa/bbb/ccc")); + assert_se(path_equal(path_kill_slashes(p2), "/aaa/./ccc")); + assert_se(path_equal(path_kill_slashes(p3), "/./")); } } static void test_find_binary(const char *self) { char *p; - assert(find_binary("/bin/sh", &p) == 0); + assert_se(find_binary("/bin/sh", &p) == 0); puts(p); - assert(streq(p, "/bin/sh")); + assert_se(streq(p, "/bin/sh")); free(p); - assert(find_binary(self, &p) == 0); + assert_se(find_binary(self, &p) == 0); puts(p); - assert(endswith(p, "/test-path-util")); - assert(path_is_absolute(p)); + assert_se(endswith(p, "/test-path-util")); + assert_se(path_is_absolute(p)); free(p); - assert(find_binary("sh", &p) == 0); + assert_se(find_binary("sh", &p) == 0); puts(p); - assert(endswith(p, "/sh")); - assert(path_is_absolute(p)); + assert_se(endswith(p, "/sh")); + assert_se(path_is_absolute(p)); free(p); - assert(find_binary("xxxx-xxxx", &p) == -ENOENT); + assert_se(find_binary("xxxx-xxxx", &p) == -ENOENT); - assert(find_binary("/some/dir/xxxx-xxxx", &p) == -ENOENT); + assert_se(find_binary("/some/dir/xxxx-xxxx", &p) == -ENOENT); } static void test_prefixes(void) { @@ -154,12 +156,33 @@ static void test_prefixes(void) { b = false; PATH_FOREACH_PREFIX_MORE(s, "") { - assert(!b); - assert(streq(s, "")); + assert_se(!b); + assert_se(streq(s, "")); b = true; } } +static void test_path_join(void) { + +#define test_join(root, path, rest, expected) { \ + _cleanup_free_ char *z = NULL; \ + z = path_join(root, path, rest); \ + assert_se(streq(z, expected)); \ + } + + 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", "/", 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, "/", NULL, "/"); +} + static void test_fsck_exists(void) { /* Ensure we use a sane default for PATH. */ unsetenv("PATH"); @@ -170,10 +193,83 @@ static void test_fsck_exists(void) { assert_se(fsck_exists("AbCdE") == -ENOENT); } +static void test_make_relative(void) { + char *result; + + assert_se(path_make_relative("some/relative/path", "/some/path", &result) < 0); + assert_se(path_make_relative("/some/path", "some/relative/path", &result) < 0); + +#define test(from_dir, to_path, expected) { \ + _cleanup_free_ char *z = NULL; \ + path_make_relative(from_dir, to_path, &z); \ + assert_se(streq(z, expected)); \ + } + + test("/", "/", "."); + test("/", "/some/path", "some/path"); + test("/some/path", "/some/path", "."); + test("/some/path", "/some/path/in/subdir", "in/subdir"); + test("/some/path", "/", "../.."); + test("/some/path", "/some/other/path", "../other/path"); + test("//extra/////slashes///won't////fool///anybody//", "////extra///slashes////are/just///fine///", "../../../are/just/fine"); +} + +static void test_strv_resolve(void) { + char tmp_dir[] = "/tmp/test-path-util-XXXXXX"; + _cleanup_strv_free_ char **search_dirs = NULL; + _cleanup_strv_free_ char **absolute_dirs = NULL; + char **d; + + assert_se(mkdtemp(tmp_dir) != NULL); + + search_dirs = strv_new("/dir1", "/dir2", "/dir3", NULL); + assert_se(search_dirs); + STRV_FOREACH(d, search_dirs) { + char *p = strappend(tmp_dir, *d); + assert_se(p); + assert_se(strv_push(&absolute_dirs, p) == 0); + } + + assert_se(mkdir(absolute_dirs[0], 0700) == 0); + assert_se(mkdir(absolute_dirs[1], 0700) == 0); + assert_se(symlink("dir2", absolute_dirs[2]) == 0); + + path_strv_resolve(search_dirs, tmp_dir); + assert_se(streq(search_dirs[0], "/dir1")); + assert_se(streq(search_dirs[1], "/dir2")); + assert_se(streq(search_dirs[2], "/dir2")); + + assert_se(rm_rf_dangerous(tmp_dir, false, true, false) == 0); +} + +static void test_path_startswith(void) { + assert_se(path_startswith("/foo/bar/barfoo/", "/foo")); + assert_se(path_startswith("/foo/bar/barfoo/", "/foo/")); + assert_se(path_startswith("/foo/bar/barfoo/", "/")); + assert_se(path_startswith("/foo/bar/barfoo/", "////")); + assert_se(path_startswith("/foo/bar/barfoo/", "/foo//bar/////barfoo///")); + assert_se(path_startswith("/foo/bar/barfoo/", "/foo/bar/barfoo////")); + assert_se(path_startswith("/foo/bar/barfoo/", "/foo/bar///barfoo/")); + assert_se(path_startswith("/foo/bar/barfoo/", "/foo////bar/barfoo/")); + assert_se(path_startswith("/foo/bar/barfoo/", "////foo/bar/barfoo/")); + assert_se(path_startswith("/foo/bar/barfoo/", "/foo/bar/barfoo")); + + assert_se(!path_startswith("/foo/bar/barfoo/", "/foo/bar/barfooa/")); + assert_se(!path_startswith("/foo/bar/barfoo/", "/foo/bar/barfooa")); + assert_se(!path_startswith("/foo/bar/barfoo/", "")); + assert_se(!path_startswith("/foo/bar/barfoo/", "/bar/foo")); + assert_se(!path_startswith("/foo/bar/barfoo/", "/f/b/b/")); +} + int main(int argc, char **argv) { test_path(); test_find_binary(argv[0]); test_prefixes(); + test_path_join(); test_fsck_exists(); + test_make_relative(); + test_strv_resolve(); + test_path_startswith(); + return 0; }