test-path-util: fix another stupid test failure

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-03-29 20:26:47 -04:00
parent 1dda524f05
commit a696dbef34

View File

@ -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));