journalctl: use _COMM= match for scripts

[elogind.git] / src / test / test-path-util.c

diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index 2bca5ef60480e5f53b226dbd0fdedb0448b0ffee..f396b32ffeb72b4e15bb648c6afeb32e6df7ac76 100644 (file)
--- 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"
@@ -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));