test-paths.t: enable for Windows using #if
authorAdrian Buehlmann <adrian@cadifra.com>
Sun, 03 Jun 2012 19:35:45 +0200
changeset 16843 61f3ca8e4d39
parent 16842 a3ea092203a5
child 16845 4594729c61ee
child 16883 5e3a1b96dbb0
test-paths.t: enable for Windows using #if If the no-msys exit at the beginning is removed, the test fails on Windows with MSYS with: --- C:\Users\adi\hgrepos\hg-main\tests\test-paths.t +++ C:\Users\adi\hgrepos\hg-main\tests\test-paths.t.err @@ -24,7 +24,7 @@ expand = $TESTTMP/a/foo/bar (glob) $ SOMETHING=/foo hg paths dupe = $TESTTMP/b (glob) - expand = /foo/bar + expand = c:/MinGW/msys/1.0/foo/bar $ hg paths -q dupe expand caused by http://www.mingw.org/wiki/Posix_path_conversion .
tests/test-paths.t
--- a/tests/test-paths.t	Fri Jun 01 02:25:12 2012 +0200
+++ b/tests/test-paths.t	Sun Jun 03 19:35:45 2012 +0200
@@ -1,5 +1,3 @@
-  $ "$TESTDIR/hghave" no-msys || exit 80 # MSYS will translate /foo/bar as if it was a real file path
-
   $ hg init a
   $ hg clone a b
   updating to branch default
@@ -24,9 +22,15 @@
   $ SOMETHING=foo hg paths
   dupe = $TESTTMP/b (glob)
   expand = $TESTTMP/a/foo/bar (glob)
+#if msys
+  $ SOMETHING=//foo hg paths
+  dupe = $TESTTMP/b (glob)
+  expand = /foo/bar
+#else
   $ SOMETHING=/foo hg paths
   dupe = $TESTTMP/b (glob)
   expand = /foo/bar
+#endif
   $ hg paths -q
   dupe
   expand