changeset 41897:0cbcb3e13fcf

tests: stabilize test-split.t for Windows It looks like there will be additional problems beyond this trivial fix, but this should make the bot green again.
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 09 Mar 2019 12:55:24 -0500
parents e82c932c01e3
children 39020ff59b37
files tests/test-split.t
diffstat 1 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-split.t	Thu Mar 07 22:14:22 2019 -0500
+++ b/tests/test-split.t	Sat Mar 09 12:55:24 2019 -0500
@@ -718,8 +718,12 @@
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m "initial"
-  $ chmod +x foo
-  $ hg ci -m "make executable"
+  $ hg import -q --bypass -m "make executable" - <<EOF
+  > diff --git a/foo b/foo
+  > old mode 100644
+  > new mode 100755
+  > EOF
+  $ hg up -q
 
   $ hg glog
   @  1:3a2125f0f4cb make executable
@@ -727,6 +731,7 @@
   o  0:51f273a58d82 initial
   
 
+#if no-windows
   $ printf 'y\ny\ny\n' | hg split
   diff --git a/foo b/foo
   old mode 100644
@@ -751,3 +756,11 @@
   new mode 100755
   examine changes to 'foo'? [Ynesfdaq?] abort: response expected
   [255]
+#else
+
+TODO: Fix this on Windows. See issue 2020 and 5883
+
+  $ printf 'y\ny\ny\n' | hg split
+  abort: cannot split an empty revision
+  [255]
+#endif