changeset 36136:6767e7ce2c31

test-narrow: partially stabilize on Windows test-narrow-strip.t is still broken. I don't see any feature condititionals, so it might be an actual problem.
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 13 Feb 2018 00:54:36 -0500
parents 8b33eb349e0b
children f52a9336ac5f
files tests/test-narrow-patterns.t tests/test-narrow-update.t
diffstat 2 files changed, 19 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-narrow-patterns.t	Tue Feb 13 00:06:22 2018 -0500
+++ b/tests/test-narrow-patterns.t	Tue Feb 13 00:54:36 2018 -0500
@@ -23,8 +23,21 @@
   >   hg add $d/bar
   >   hg commit -m "add $d/bar"
   > done
+#if execbit
   $ chmod +x dir1/dirA/foo
   $ hg commit -m "make dir1/dirA/foo executable"
+#else
+  $ hg import --bypass - <<EOF
+  > # HG changeset patch
+  > make dir1/dirA/foo executable
+  > 
+  > diff --git a/dir1/dirA/foo b/dir1/dirA/foo
+  > old mode 100644
+  > new mode 100755
+  > EOF
+  applying patch from stdin
+  $ hg update -qr tip
+#endif
   $ hg log -G -T '{rev} {node|short} {files}\n'
   @  13 c87ca422d521 dir1/dirA/foo
   |
@@ -149,10 +162,14 @@
   dir2
   dir2/bar
   dir2/foo
+
+#if execbit
   $ test -x dir1/dirA/foo && echo executable
   executable
   $ test -x dir1/dirA/bar || echo not executable
   not executable
+#endif
+
   $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
   @  8 c87ca422d521 dir1/dirA/foo
   |
--- a/tests/test-narrow-update.t	Tue Feb 13 00:06:22 2018 -0500
+++ b/tests/test-narrow-update.t	Tue Feb 13 00:54:36 2018 -0500
@@ -47,7 +47,7 @@
   $ hg update -q 'desc("modify inside")'
   $ find *
   inside
-  inside/f1 (glob)
+  inside/f1
   $ cat inside/f1
   modified
 
@@ -56,7 +56,7 @@
   $ hg update -q 'desc("modify outside")'
   $ find *
   inside
-  inside/f1 (glob)
+  inside/f1
   $ cat inside/f1
   modified