summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-02-01 19:37:44 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-02-01 19:37:44 +0000
commit55dff6333c667bb40725b0a025bf3ccecb7f7e4d (patch)
tree2434e4f186bc5d1adf02e8a2ad08f200ea22d8f5 /src
parentadde parameter to select knot node position (diff)
parentpatch by Mark Harmer to allow DirUtil test to pass in Windows. (Bug 1409208) (diff)
downloadinkscape-55dff6333c667bb40725b0a025bf3ccecb7f7e4d.tar.gz
inkscape-55dff6333c667bb40725b0a025bf3ccecb7f7e4d.zip
update to trunk
(bzr r13879.1.5)
Diffstat (limited to 'src')
-rw-r--r--src/dir-util-test.h8
1 files changed, 8 insertions, 0 deletions
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++ )