X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_utils_expand_path.c;h=d5cab002e9096ade325d9cc820586aec96f75442;hp=44173f6f023e2c18ae8eb848ef15965c0978ca7c;hb=4b223a6755662f272f7db155ee380528728e5dd1;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9

diff --git a/tests/unit/test_utils_expand_path.c b/tests/unit/test_utils_expand_path.c
index 44173f6f0..d5cab002e 100644
--- a/tests/unit/test_utils_expand_path.c
+++ b/tests/unit/test_utils_expand_path.c
@@ -26,8 +26,7 @@
 
 #include <tap/tap.h>
 
-#include <src/common/utils.h>
-
+#include <common/utils.h>
 #include <common/common.h>
 
 /* For error.h */
@@ -54,6 +53,7 @@ struct symlink_test_input {
 /* Valid test cases */
 static struct valid_test_input valid_tests_inputs[] = {
 	{ "/a/b/c/d/e",			"",		"/a/b/c/d/e"	},
+	{ "/a//b//c/d/e",		"",		"/a/b/c/d/e"	},
 	{ "./a/b/c/d/e",		".",		"/a/b/c/d/e"	},
 	{ "../a/b/c/d/../e",		"..",		"/a/b/c/e"	},
 	{ ".././a/b/c/d/./e",		"..",		"/a/b/c/d/e"	},
@@ -312,9 +312,12 @@ static void test_utils_expand_path(void)
 
 	/* Test invalid cases */
 	for (i = 0; i < num_invalid_tests; i++) {
-		sprintf(name, "invalid test case: %s", invalid_tests_inputs[i]);
+		const char *test_input = invalid_tests_inputs[i];
+
+		sprintf(name, "invalid test case: %s", test_input ?
+				test_input : "NULL");
 
-		result = utils_expand_path(invalid_tests_inputs[i]);
+		result = utils_expand_path(test_input);
 		if (result != NULL) {
 			free(result);
 		}