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=9f8ae4dee1ea5e3f1570e23b8232a218c6c1c251;hp=be686f29e7905af316d6cbca29d036516a2b86d1;hb=6b56a65123720325ad5084b3e888bf6bfe89c148;hpb=590f50130f3d30f660fee6781cf4ba97cba8f627

diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index be686f29e..9f8ae4dee 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -19,6 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdio.h>
+
 #include "path-util.h"
 #include "util.h"
 #include "macro.h"
@@ -48,22 +50,24 @@ static void test_path(void) {
         assert_se(is_path("a/b"));
         assert_se(!is_path("."));
 
-        assert_se(streq(path_get_file_name("./aa/bb/../file.da."), "file.da."));
-        assert_se(streq(path_get_file_name("/aa///.file"), ".file"));
-        assert_se(streq(path_get_file_name("/aa///file..."), "file..."));
-        assert_se(streq(path_get_file_name("file.../"), ""));
-
-#define test_parent(x, y) {                     \
-                char *z;                        \
-                int r = path_get_parent(x, &z); \
-                assert_se(r==0);                \
-                assert_se(streq(z, y));         \
+        assert_se(streq(basename("./aa/bb/../file.da."), "file.da."));
+        assert_se(streq(basename("/aa///.file"), ".file"));
+        assert_se(streq(basename("/aa///file..."), "file..."));
+        assert_se(streq(basename("file.../"), ""));
+
+#define test_parent(x, y) {                                \
+                char _cleanup_free_ *z = NULL;             \
+                int r = path_get_parent(x, &z);            \
+                printf("expected: %s\n", y ? y : "error"); \
+                printf("actual: %s\n", r<0 ? "error" : z); \
+                assert_se((y==NULL) ^ (r==0));             \
+                assert_se(y==NULL || path_equal(z, y));    \
         }
 
         test_parent("./aa/bb/../file.da.", "./aa/bb/..");
         test_parent("/aa///.file", "/aa///");
         test_parent("/aa///file...", "/aa///");
-        test_parent("file.../", "file...");
+        test_parent("file.../", NULL);
 
         assert_se(path_is_mount_point("/", true));
         assert_se(path_is_mount_point("/", false));
@@ -79,7 +83,119 @@ static void test_path(void) {
         }
 }
 
-int main(void) {
+static void test_find_binary(const char *self) {
+        char *p;
+
+        assert(find_binary("/bin/sh", &p) == 0);
+        puts(p);
+        assert(streq(p, "/bin/sh"));
+        free(p);
+
+        assert(find_binary(self, &p) == 0);
+        puts(p);
+        assert(endswith(p, "/test-path-util"));
+        assert(path_is_absolute(p));
+        free(p);
+
+        assert(find_binary("sh", &p) == 0);
+        puts(p);
+        assert(endswith(p, "/sh"));
+        assert(path_is_absolute(p));
+        free(p);
+
+        assert(find_binary("xxxx-xxxx", &p) == -ENOENT);
+
+        assert(find_binary("/some/dir/xxxx-xxxx", &p) == -ENOENT);
+}
+
+static void test_prefixes(void) {
+        static const char* values[] = { "/a/b/c/d", "/a/b/c", "/a/b", "/a", "", NULL};
+        unsigned i;
+        char s[PATH_MAX];
+        bool b;
+
+        i = 0;
+        PATH_FOREACH_PREFIX_MORE(s, "/a/b/c/d") {
+                log_error("---%s---", s);
+                assert_se(streq(s, values[i++]));
+        }
+        assert_se(values[i] == NULL);
+
+        i = 1;
+        PATH_FOREACH_PREFIX(s, "/a/b/c/d") {
+                log_error("---%s---", s);
+                assert_se(streq(s, values[i++]));
+        }
+        assert_se(values[i] == NULL);
+
+        i = 0;
+        PATH_FOREACH_PREFIX_MORE(s, "////a////b////c///d///////")
+                assert_se(streq(s, values[i++]));
+        assert_se(values[i] == NULL);
+
+        i = 1;
+        PATH_FOREACH_PREFIX(s, "////a////b////c///d///////")
+                assert_se(streq(s, values[i++]));
+        assert_se(values[i] == NULL);
+
+        PATH_FOREACH_PREFIX(s, "////")
+                assert_not_reached("Wut?");
+
+        b = false;
+        PATH_FOREACH_PREFIX_MORE(s, "////") {
+                assert_se(!b);
+                assert_se(streq(s, ""));
+                b = true;
+        }
+        assert_se(b);
+
+        PATH_FOREACH_PREFIX(s, "")
+                assert_not_reached("wut?");
+
+        b = false;
+        PATH_FOREACH_PREFIX_MORE(s, "") {
+                assert(!b);
+                assert(streq(s, ""));
+                b = true;
+        }
+}
+
+static void test_fsck_exists(void) {
+        /* Ensure we use a sane default for PATH. */
+        unsetenv("PATH");
+
+        /* fsck.minix is provided by util-linux and will probably exist. */
+        assert_se(fsck_exists("minix") == 0);
+
+        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) {                     \
+                path_make_relative(from_dir, to_path, &result); \
+                assert_se(streq(result, expected));             \
+                free(result);                                   \
+        }
+
+        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");
+}
+
+int main(int argc, char **argv) {
         test_path();
+        test_find_binary(argv[0]);
+        test_prefixes();
+        test_fsck_exists();
+        test_make_relative();
         return 0;
 }