From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 30 Mar 2013 00:26:47 +0000 (-0400)
Subject: test-path-util: fix another stupid test failure
X-Git-Tag: v201~151
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a696dbef3474f3586b0f189245804b355a700795

test-path-util: fix another stupid test failure
---

diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index be686f29e..127e17803 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"
@@ -53,17 +55,19 @@ static void test_path(void) {
         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));         \
+#define test_parent(x, y) {                                \
+                char *z;                                   \
+                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));