From 43e3001d4ce46905549d92951e86c7ceb5c9eb4c Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Sun, 1 Feb 2015 11:46:39 -0500 Subject: patch by Mark Harmer to allow DirUtil test to pass in Windows. (Bug 1409208) Fixed bugs: - https://launchpad.net/bugs/1409208 (bzr r13887) --- src/dir-util-test.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src') diff --git a/src/dir-util-test.h b/src/dir-util-test.h index cc3bc20b8..735f0174e 100644 --- a/src/dir-util-test.h +++ b/src/dir-util-test.h @@ -12,11 +12,19 @@ public: void testBase() { char const* cases[][3] = { +#if defined(WIN32) || defined(__WIN32__) + {"\\foo\\bar", "\\foo", "bar"}, + {"\\foo\\barney", "\\foo\\bar", "\\foo\\barney"}, + {"\\foo\\bar\\baz", "\\foo\\", "bar\\baz"}, + {"\\foo\\bar\\baz", "\\", "foo\\bar\\baz"}, + {"\\foo\\bar\\baz", "\\foo\\qux", "\\foo\\bar\\baz"}, +#else {"/foo/bar", "/foo", "bar"}, {"/foo/barney", "/foo/bar", "/foo/barney"}, {"/foo/bar/baz", "/foo/", "bar/baz"}, {"/foo/bar/baz", "/", "foo/bar/baz"}, {"/foo/bar/baz", "/foo/qux", "/foo/bar/baz"}, +#endif }; for ( size_t i = 0; i < G_N_ELEMENTS(cases); i++ ) -- cgit v1.2.3