[PATCH] test-narrow: partially stabilize on Windows
Matt Harbison
mharbison72 at gmail.com
Tue Feb 13 05:55:50 UTC 2018
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1518501276 18000
# Tue Feb 13 00:54:36 2018 -0500
# Node ID 06a3f7c52e76f980ed3e58b119dd88ee1c679530
# Parent 434f9de0dcc58f26cf3903e0b6464e8852e2386d
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.
diff --git a/tests/test-narrow-patterns.t b/tests/test-narrow-patterns.t
--- a/tests/test-narrow-patterns.t
+++ b/tests/test-narrow-patterns.t
@@ -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
|
diff --git a/tests/test-narrow-update.t b/tests/test-narrow-update.t
--- a/tests/test-narrow-update.t
+++ b/tests/test-narrow-update.t
@@ -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
More information about the Mercurial-devel
mailing list