Patchwork [STABLE] tests: stabilize the recent checkexec changes on Windows

login
register
mail settings
Submitter Matt Harbison
Date Nov. 20, 2018, 11:49 p.m.
Message ID <25b7c4cb5de1593e16bb.1542757741@mharbison-pc.attotech.com>
Download mbox | patch
Permalink /patch/36685/
State Accepted
Headers show

Comments

Matt Harbison - Nov. 20, 2018, 11:49 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1542757639 18000
#      Tue Nov 20 18:47:19 2018 -0500
# Branch stable
# Node ID 25b7c4cb5de1593e16bbd7a7dafbd28baa743995
# Parent  bd0874977a5e5921f7f8615f2eb96d267f641c2e
tests: stabilize the recent checkexec changes on Windows

This goes with bd0874977a5e.
Yuya Nishihara - Nov. 21, 2018, 11:32 a.m.
On Tue, 20 Nov 2018 18:49:01 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1542757639 18000
> #      Tue Nov 20 18:47:19 2018 -0500
> # Branch stable
> # Node ID 25b7c4cb5de1593e16bbd7a7dafbd28baa743995
> # Parent  bd0874977a5e5921f7f8615f2eb96d267f641c2e
> tests: stabilize the recent checkexec changes on Windows

Queued for stable, thanks.

Patch

diff --git a/tests/test-fncache.t b/tests/test-fncache.t
--- a/tests/test-fncache.t
+++ b/tests/test-fncache.t
@@ -88,9 +88,9 @@  Non store repo:
   .hg/00manifest.i
   .hg/cache
   .hg/cache/branch2-served
-  .hg/cache/checkisexec
-  .hg/cache/checklink
-  .hg/cache/checklink-target
+  .hg/cache/checkisexec (execbit !)
+  .hg/cache/checklink (symlink !)
+  .hg/cache/checklink-target (symlink !)
   .hg/cache/manifestfulltextcache (reporevlogstore !)
   .hg/cache/rbc-names-v1
   .hg/cache/rbc-revs-v1
@@ -125,9 +125,9 @@  Non fncache repo:
   .hg/00changelog.i
   .hg/cache
   .hg/cache/branch2-served
-  .hg/cache/checkisexec
-  .hg/cache/checklink
-  .hg/cache/checklink-target
+  .hg/cache/checkisexec (execbit !)
+  .hg/cache/checklink (symlink !)
+  .hg/cache/checklink-target (symlink !)
   .hg/cache/manifestfulltextcache (reporevlogstore !)
   .hg/cache/rbc-names-v1
   .hg/cache/rbc-revs-v1
diff --git a/tests/test-share.t b/tests/test-share.t
--- a/tests/test-share.t
+++ b/tests/test-share.t
@@ -28,15 +28,16 @@  share shouldn't have a full cache dir, o
   default                        0:d3873e73d99e
   $ hg tags
   tip                                0:d3873e73d99e
-  $ ls -1 .hg/cache
-  checkisexec
-  checklink
-  checklink-target
+  $ ls -1 .hg/cache || true
+  ls: .hg/cache: $ENOENT$ (no-execbit no-symlink !)
+  checkisexec (execbit !)
+  checklink (symlink !)
+  checklink-target (symlink !)
   $ ls -1 ../repo1/.hg/cache
   branch2-served
-  checkisexec
-  checklink
-  checklink-target
+  checkisexec (execbit !)
+  checklink (symlink !)
+  checklink-target (symlink !)
   manifestfulltextcache (reporevlogstore !)
   rbc-names-v1
   rbc-revs-v1