From a696dbef3474f3586b0f189245804b355a700795 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 29 Mar 2013 20:26:47 -0400 Subject: [PATCH 1/1] test-path-util: fix another stupid test failure --- src/test/test-path-util.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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 . ***/ +#include + #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)); -- 2.30.2