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=e303e488e2a1610ff4602910f97bd3129b99feed;hp=2bca5ef60480e5f53b226dbd0fdedb0448b0ffee;hb=8097ab4f0cf7a52ac6ca45cb2b2dfe4850a2dee5;hpb=76877b46b652fbfcf8618458556178717b815cd8
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index 2bca5ef60..e303e488e 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 .
***/
+#include
+
#include "path-util.h"
#include "util.h"
#include "macro.h"
@@ -51,19 +53,21 @@ static void test_path(void) {
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(path_get_file_name("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,58 @@ static void test_path(void) {
}
}
+static void test_find_binary(void) {
+ char *p;
+
+ assert(find_binary("/bin/sh", &p) == 0);
+ puts(p);
+ assert(streq(p, "/bin/sh"));
+ free(p);
+
+ assert(find_binary("./test-path-util", &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);
+}
+
+static void test_prefixes(void) {
+ static const char* values[] = { "/a/b/c", "/a/b", "/a", "", NULL};
+ unsigned i = 0;
+ char s[PATH_MAX];
+
+ 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(s, "////a////b////c///d///////")
+ assert_se(streq(s, values[i++]));
+
+ assert_se(values[i] == NULL);
+
+ PATH_FOREACH_PREFIX(s, "////")
+ assert_se(streq(s, ""));
+
+ PATH_FOREACH_PREFIX(s, "")
+ assert_not_reached("wut?");
+
+}
+
int main(void) {
test_path();
+ test_find_binary();
+ test_prefixes();
return 0;
}