X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-path-util.c;h=ed3b315a61ded4bd575200e60d39493d85e1a70a;hb=f268980d2cee694fa4118a71402a47c316af0425;hp=e303e488e2a1610ff4602910f97bd3129b99feed;hpb=fecffe5d0a1bd66d80e5a8728ff8a89673be0df7;p=elogind.git

diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index e303e488e..ed3b315a6 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -107,29 +107,55 @@ static void test_find_binary(void) {
 }
 
 static void test_prefixes(void) {
-        static const char* values[] = { "/a/b/c", "/a/b", "/a", "", NULL};
-        unsigned i = 0;
+        static const char* values[] = { "/a/b/c/d", "/a/b/c", "/a/b", "/a", "", NULL};
+        unsigned i;
         char s[PATH_MAX];
+        bool b;
 
-        PATH_FOREACH_PREFIX(s, "/a/b/c/d") {
+        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(s, "////a////b////c///d///////")
+        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;
+        }
 }
 
 int main(void) {