summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-03-29 20:26:47 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-03-29 20:30:21 -0400
commita696dbef3474f3586b0f189245804b355a700795 (patch)
tree1d0583e6f454fbbcc3a27d42cd2fbcc1f576b261
parent1dda524f05ebe2ccb72f9bbd58506527685aaa1e (diff)
downloadsystemd-a696dbef3474f3586b0f189245804b355a700795.tar.gz
test-path-util: fix another stupid test failure
-rw-r--r--src/test/test-path-util.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index be686f29e7..127e17803f 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));