[PATCH 2 of 3] tests: stabilize for recent wcache changes
Matt Harbison
mharbison72 at gmail.com
Tue Dec 4 00:21:09 EST 2018
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1543900572 18000
# Tue Dec 04 00:16:12 2018 -0500
# Node ID d79558fe55840e43de7eb1b3b05c46b35293d72d
# Parent faaf565508106fb08151ee169b9aa4b937374cc1
tests: stabilize for recent wcache changes
This goes with 47e3f554df35::d5622dfe4ba3. I'm not sure if it was really
expected that there would be no wcache directory if neither execbit nor symlink
is supported.
diff --git a/tests/test-fncache.t b/tests/test-fncache.t
--- a/tests/test-fncache.t
+++ b/tests/test-fncache.t
@@ -108,9 +108,9 @@ Non store repo:
.hg/undo.dirstate
.hg/undo.phaseroots
.hg/wcache
- .hg/wcache/checkisexec
- .hg/wcache/checklink
- .hg/wcache/checklink-target
+ .hg/wcache/checkisexec (execbit !)
+ .hg/wcache/checklink (symlink !)
+ .hg/wcache/checklink-target (symlink !)
$ cd ..
Non fncache repo:
@@ -149,9 +149,9 @@ Non fncache repo:
.hg/undo.desc
.hg/undo.dirstate
.hg/wcache
- .hg/wcache/checkisexec
- .hg/wcache/checklink
- .hg/wcache/checklink-target
+ .hg/wcache/checkisexec (execbit !)
+ .hg/wcache/checklink (symlink !)
+ .hg/wcache/checklink-target (symlink !)
$ cd ..
Encoding of reserved / long paths in the store
diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t
--- a/tests/test-hardlinks.t
+++ b/tests/test-hardlinks.t
@@ -265,9 +265,9 @@ r4 has hardlinks in the working dir (not
2 r4/.hg/undo.branch
2 r4/.hg/undo.desc
[24] r4/\.hg/undo\.dirstate (re)
- 2 r4/.hg/wcache/checkisexec
- 2 r4/.hg/wcache/checklink-target
- 2 r4/.hg/wcache/checknoexec
+ 2 r4/.hg/wcache/checkisexec (execbit !)
+ 2 r4/.hg/wcache/checklink-target (symlink !)
+ 2 r4/.hg/wcache/checknoexec (execbit !)
2 r4/d1/data1
2 r4/d1/f2
2 r4/f1
@@ -316,9 +316,9 @@ Update back to revision 12 in r4 should
2 r4/.hg/undo.branch
2 r4/.hg/undo.desc
[24] r4/\.hg/undo\.dirstate (re)
- 2 r4/.hg/wcache/checkisexec
- 2 r4/.hg/wcache/checklink-target
- 2 r4/.hg/wcache/checknoexec
+ 2 r4/.hg/wcache/checkisexec (execbit !)
+ 2 r4/.hg/wcache/checklink-target (symlink !)
+ 2 r4/.hg/wcache/checknoexec (execbit !)
2 r4/d1/data1
2 r4/d1/f2
1 r4/f1
diff --git a/tests/test-share.t b/tests/test-share.t
--- a/tests/test-share.t
+++ b/tests/test-share.t
@@ -31,7 +31,6 @@ share shouldn't have a full cache dir, o
$ test -d .hg/cache
[1]
$ ls -1 .hg/wcache || true
- ls: .hg/wcache: $ENOENT$ (no-execbit no-symlink !)
checkisexec (execbit !)
checklink (symlink !)
checklink-target (symlink !)
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -1254,9 +1254,9 @@ Check that share works with subrepo
../shared/subrepo-2/.hg/requires
../shared/subrepo-2/.hg/sharedpath
../shared/subrepo-2/.hg/wcache
- ../shared/subrepo-2/.hg/wcache/checkisexec
- ../shared/subrepo-2/.hg/wcache/checklink
- ../shared/subrepo-2/.hg/wcache/checklink-target
+ ../shared/subrepo-2/.hg/wcache/checkisexec (execbit !)
+ ../shared/subrepo-2/.hg/wcache/checklink (symlink !)
+ ../shared/subrepo-2/.hg/wcache/checklink-target (symlink !)
../shared/subrepo-2/file
$ hg -R ../shared in
abort: repository default not found!
More information about the Mercurial-devel
mailing list