# # # patch "ChangeLog" # from [c7e3b1e5a3d4e4cbca4349ff05d170028b6c2050] # to [77d76dbd25465df6ee400101059f970526da3a58] # # patch "paths.cc" # from [3fcc561710618bd984b8ea3396c5e90577bf581d] # to [d1a8c00a2bfdac86d0dd9947b5a59010fc824fb7] # ============================================================ --- ChangeLog c7e3b1e5a3d4e4cbca4349ff05d170028b6c2050 +++ ChangeLog 77d76dbd25465df6ee400101059f970526da3a58 @@ -1,5 +1,10 @@ 2006-12-15 Nathaniel Smith + * paths.cc: Add a few more normalization tests for things like + "foo/.". + +2006-12-15 Nathaniel Smith + * tests/fail_cleanly_when__MTN_format_empty: Rename to... * tests/fail_cleanly_when__MTN_format_corrupt: ...this, and add a few more test cases. ============================================================ --- paths.cc 3fcc561710618bd984b8ea3396c5e90577bf581d +++ paths.cc d1a8c00a2bfdac86d0dd9947b5a59010fc824fb7 @@ -716,6 +716,8 @@ UNIT_TEST(paths, file_path_internal) "_MTN", "_MTN/blah", "foo/bar/", + "foo/bar/.", + "foo/bar/./", "foo/./bar", "./foo", ".", @@ -877,6 +879,8 @@ UNIT_TEST(paths, file_path_external_null //check_fp_normalizes_to("foo//bar", "foo/bar"); check_fp_normalizes_to("foo/../bar", "bar"); check_fp_normalizes_to("foo/bar/", "foo/bar"); + check_fp_normalizes_to("foo/bar/.", "foo/bar"); + check_fp_normalizes_to("foo/bar/./", "foo/bar"); check_fp_normalizes_to("foo/./bar/", "foo/bar"); check_fp_normalizes_to("./foo", "foo"); //check_fp_normalizes_to("foo///.//", "foo"); @@ -957,6 +961,8 @@ UNIT_TEST(paths, file_path_external_pref //check_fp_normalizes_to("foo//bar", "a/b/foo/bar"); check_fp_normalizes_to("foo/../bar", "a/b/bar"); check_fp_normalizes_to("foo/bar/", "a/b/foo/bar"); + check_fp_normalizes_to("foo/bar/.", "a/b/foo/bar"); + check_fp_normalizes_to("foo/bar/./", "a/b/foo/bar"); check_fp_normalizes_to("foo/./bar/", "a/b/foo/bar"); check_fp_normalizes_to("./foo", "a/b/foo"); //check_fp_normalizes_to("foo///.//", "a/b/foo"); @@ -1077,6 +1083,8 @@ UNIT_TEST(paths, bookkeeping) "foo/../bar", "../bar", "foo/bar/", + "foo/bar/.", + "foo/bar/./", "foo/./bar", "./foo", ".",