[PATCH V2] tests: fix up recent conditionalized output changes
Matt Harbison
mharbison72 at gmail.com
Wed May 17 02:31:56 UTC 2017
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1494725402 14400
# Sat May 13 21:30:02 2017 -0400
# Node ID 73c26b0cd78966327eba6de006ca0d1fb1b53f7e
# Parent 7040f5131454b0ae9117ec10a9f33352a04746a3
tests: fix up recent conditionalized output changes
It looks like (!) can have surprising results matching back to the original
output when adjacent lines change, probably because it uses the same code
matching that allows (?) to skip missing output. 24f55686a63d ended up adding
unconditionalized check*{exec,link} lines, duplicating the conditionalized
lines. A Windows run wanted to delete the unconditionalized lines. This now
runs on both Windows and Linux.
diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t
--- a/tests/test-hardlinks.t
+++ b/tests/test-hardlinks.t
@@ -225,14 +225,11 @@
$ nlinksdir r4
2 r4/.hg/00changelog.i
2 r4/.hg/branch
+ 2 r4/.hg/cache/branch2-base
+ 2 r4/.hg/cache/branch2-served
2 r4/.hg/cache/checkisexec (execbit !)
? r4/.hg/cache/checklink-target (glob) (symlink !)
2 r4/.hg/cache/checknoexec (execbit !)
- 2 r4/.hg/cache/branch2-base
- 2 r4/.hg/cache/branch2-served
- 2 r4/.hg/cache/checkisexec
- 2 r4/.hg/cache/checklink-target
- 2 r4/.hg/cache/checknoexec
2 r4/.hg/cache/rbc-names-v1
2 r4/.hg/cache/rbc-revs-v1
2 r4/.hg/dirstate
@@ -274,14 +271,11 @@
$ nlinksdir r4
2 r4/.hg/00changelog.i
1 r4/.hg/branch
+ 2 r4/.hg/cache/branch2-base
+ 2 r4/.hg/cache/branch2-served
2 r4/.hg/cache/checkisexec (execbit !)
2 r4/.hg/cache/checklink-target (symlink !)
2 r4/.hg/cache/checknoexec (execbit !)
- 2 r4/.hg/cache/branch2-base
- 2 r4/.hg/cache/branch2-served
- 2 r4/.hg/cache/checkisexec
- 2 r4/.hg/cache/checklink-target
- 2 r4/.hg/cache/checknoexec
2 r4/.hg/cache/rbc-names-v1
2 r4/.hg/cache/rbc-revs-v1
1 r4/.hg/dirstate
diff --git a/tests/test-tags.t b/tests/test-tags.t
--- a/tests/test-tags.t
+++ b/tests/test-tags.t
@@ -671,13 +671,10 @@
Missing tags2* files means the cache wasn't written through the normal mechanism.
$ ls tagsclient/.hg/cache
+ branch2-base
checkisexec (execbit !)
checklink (symlink !)
checklink-target (symlink !)
- branch2-base
- checkisexec
- checklink
- checklink-target
hgtagsfnodes1
Cache should contain the head only, even though other nodes have tags data
@@ -699,13 +696,10 @@
0.1 0:96ee1d7354c4
$ ls tagsclient/.hg/cache
+ branch2-base
checkisexec (execbit !)
checklink (symlink !)
checklink-target (symlink !)
- branch2-base
- checkisexec
- checklink
- checklink-target
hgtagsfnodes1
tags2-visible
More information about the Mercurial-devel
mailing list