# # patch "ChangeLog" # from [d7624c36915a7e999a823798addf412ddfcf5b7a] # to [ad6768ee6c369c78a61bd0082ec1a73e8b13d03a] # # patch "paths.cc" # from [2ab3420630ae1620569dcccdd6fb52e422bddcaa] # to [6a502c6467846bc97bd637101a42571ba84020a1] # ======================================================================== --- ChangeLog d7624c36915a7e999a823798addf412ddfcf5b7a +++ ChangeLog ad6768ee6c369c78a61bd0082ec1a73e8b13d03a @@ -1,3 +1,7 @@ +2005-09-29 Matthew Gregan + + * paths.cc: Restore two unit tests on Win32. + 2005-09-29 Richard Levitte * testsuite.at: Removed a spurious G... ======================================================================== --- paths.cc 2ab3420630ae1620569dcccdd6fb52e422bddcaa +++ paths.cc 6a502c6467846bc97bd637101a42571ba84020a1 @@ -560,9 +560,7 @@ ".foo/bar", "..foo/bar", "MTfoo/bar", -#ifndef WIN32 "foo:bar", -#endif 0 }; for (int i = 0; i < 2; ++i) @@ -855,6 +853,7 @@ #ifdef WIN32 check_system_normalizes_to("c:foo", "c:foo"); check_system_normalizes_to("c:/foo", "c:/foo"); + check_system_normalizes_to("c:\\foo", "c:/foo"); #else check_system_normalizes_to("c:foo", "/a/b/c:foo"); check_system_normalizes_to("c:/foo", "/a/b/c:/foo");