diff --git a/tests/testglib.c b/tests/testglib.c index f29bbc664..687fadd5b 100644 --- a/tests/testglib.c +++ b/tests/testglib.c @@ -843,6 +843,7 @@ test_paths (void) gchar *relative_path; gchar *canonical_path; } canonicalize_filename_checks[] = { +#ifndef G_OS_WIN32 { "/etc", "../usr/share", "/usr/share" }, { "/", "/foo/bar", "/foo/bar" }, { "/usr/bin", "../../foo/bar", "/foo/bar" }, @@ -857,7 +858,22 @@ test_paths (void) { "///triple/slash", ".", "/triple/slash" }, { "//double/slash", ".", "//double/slash" }, { "/cwd/../with/./complexities/", "./hello", "/with/complexities/hello" }, -#ifdef G_OS_WIN32 +#else + { "/etc", "../usr/share", "\\usr\\share" }, + { "/", "/foo/bar", "\\foo\\bar" }, + { "/usr/bin", "../../foo/bar", "\\foo\\bar" }, + { "/", "../../foo/bar", "\\foo\\bar" }, + { "/double//dash", "../../foo/bar", "\\foo\\bar" }, + { "/usr/share/foo", ".././././bar", "\\usr\\share\\bar" }, + { "/foo/bar", "../bar/./.././bar", "\\foo\\bar" }, + { "/test///dir", "../../././foo/bar", "\\foo\\bar" }, + { "/test///dir", "../../././/foo///bar", "\\foo\\bar" }, + { "/etc", "///triple/slash", "\\triple\\slash" }, + { "/etc", "//double/slash", "//double/slash" }, + { "///triple/slash", ".", "\\triple\\slash" }, + { "//double/slash", ".", "//double/slash\\" }, + { "/cwd/../with/./complexities/", "./hello", "\\with\\complexities\\hello" }, + { "\\etc", "..\\usr\\share", "\\usr\\share" }, { "\\", "\\foo\\bar", "\\foo\\bar" }, { "\\usr\\bin", "..\\..\\foo\\bar", "\\foo\\bar" }, @@ -870,8 +886,8 @@ test_paths (void) { "\\etc", "\\\\\\triple\\slash", "\\triple\\slash" }, { "\\etc", "\\\\double\\slash", "\\\\double\\slash" }, { "\\\\\\triple\\slash", ".", "\\triple\\slash" }, - { "\\\\double\\slash", ".", "\\\\double\\slash" }, - { "\\cwd\\..\\with\\.\\complexities\\", ".\\hello", "\\cwd\\with\\complexities\\hello" }, + { "\\\\double\\slash", ".", "\\\\double\\slash\\" }, + { "\\cwd\\..\\with\\.\\complexities\\", ".\\hello", "\\with\\complexities\\hello" }, #endif }; const guint n_canonicalize_filename_checks = G_N_ELEMENTS (canonicalize_filename_checks);