X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-path-util.c;h=6396fcb3980f3eb1348646309cbb7becb1edca53;hb=e0952d9d021234e79f3a70f33a9e5d201872a417;hp=19462c357183cd3563916a63d997aea18fb341e5;hpb=c8b32e11ee24a333f8f7c7c15226741d22e55fdd;p=elogind.git diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index 19462c357..6396fcb39 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -27,23 +27,37 @@ #include "macro.h" #include "strv.h" +#define test_path_compare(a, b, result) { \ + assert_se(path_compare(a, b) == result); \ + assert_se(path_compare(b, a) == -result); \ + assert_se(path_equal(a, b) == !result); \ + assert_se(path_equal(b, a) == !result); \ + } static void test_path(void) { - assert_se(path_equal("/goo", "/goo")); - assert_se(path_equal("//goo", "/goo")); - assert_se(path_equal("//goo/////", "/goo")); - assert_se(path_equal("goo/////", "goo")); + test_path_compare("/goo", "/goo", 0); + test_path_compare("/goo", "/goo", 0); + test_path_compare("//goo", "/goo", 0); + test_path_compare("//goo/////", "/goo", 0); + test_path_compare("goo/////", "goo", 0); + + test_path_compare("/goo/boo", "/goo//boo", 0); + test_path_compare("//goo/boo", "/goo/boo//", 0); - assert_se(path_equal("/goo/boo", "/goo//boo")); - assert_se(path_equal("//goo/boo", "/goo/boo//")); + test_path_compare("/", "///", 0); - assert_se(path_equal("/", "///")); + test_path_compare("/x", "x/", 1); + test_path_compare("x/", "/", -1); - assert_se(!path_equal("/x", "x/")); - assert_se(!path_equal("x/", "/")); + test_path_compare("/x/./y", "x/y", 1); + test_path_compare("x/.y", "x/y", -1); - assert_se(!path_equal("/x/./y", "x/y")); - assert_se(!path_equal("x/.y", "x/y")); + test_path_compare("foo", "/foo", -1); + test_path_compare("/foo", "/foo/bar", -1); + test_path_compare("/foo/aaa", "/foo/b", -1); + test_path_compare("/foo/aaa", "/foo/b/a", -1); + test_path_compare("/foo/a", "/foo/aaa", -1); + test_path_compare("/foo/a/b", "/foo/aaa", -1); assert_se(path_is_absolute("/")); assert_se(!path_is_absolute("./")); @@ -79,35 +93,38 @@ 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) { +static void test_find_binary(const char *self, bool local) { char *p; - assert(find_binary("/bin/sh", &p) == 0); + assert_se(find_binary("/bin/sh", local, &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, local, &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", local, &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", local, &p) == -ENOENT); - assert(find_binary("/some/dir/xxxx-xxxx", &p) == -ENOENT); + assert_se(find_binary("/some/dir/xxxx-xxxx", local, &p) == + (local ? -ENOENT : 0)); + if (!local) + free(p); } static void test_prefixes(void) { @@ -156,12 +173,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"); @@ -178,10 +216,10 @@ static void test_make_relative(void) { 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) { \ - path_make_relative(from_dir, to_path, &result); \ - assert_se(streq(result, expected)); \ - free(result); \ +#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("/", "/", "."); @@ -221,12 +259,35 @@ static void test_strv_resolve(void) { 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_find_binary(argv[0], true); + test_find_binary(argv[0], false); test_prefixes(); + test_path_join(); test_fsck_exists(); test_make_relative(); test_strv_resolve(); + test_path_startswith(); + return 0; }