Patchwork test-hardlinks: stabilize for Windows

login
register
mail settings
Submitter Matt Harbison
Date June 11, 2017, 3:15 p.m.
Message ID <7fe4e7f3e4ac40c6f6d2.1497194142@Envy>
Download mbox | patch
Permalink /patch/21330/
State Accepted
Headers show

Comments

Matt Harbison - June 11, 2017, 3:15 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1497067617 14400
#      Sat Jun 10 00:06:57 2017 -0400
# Node ID 7fe4e7f3e4ac40c6f6d2699e050844d9c44ec190
# Parent  d6393bd73356a00c2e128d5ca43a261d6ebc26bf
test-hardlinks: stabilize for Windows

This broke in c2cb0de25120, which breaks hardlinks when the executable bit is
toggled.
Yuya Nishihara - June 12, 2017, 12:46 p.m.
On Sun, 11 Jun 2017 11:15:42 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1497067617 14400
> #      Sat Jun 10 00:06:57 2017 -0400
> # Node ID 7fe4e7f3e4ac40c6f6d2699e050844d9c44ec190
> # Parent  d6393bd73356a00c2e128d5ca43a261d6ebc26bf
> test-hardlinks: stabilize for Windows

Queued, thanks.

Patch

diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t
--- a/tests/test-hardlinks.t
+++ b/tests/test-hardlinks.t
@@ -276,7 +276,8 @@ 
 
 
   $ hg -R r4 up 12
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved (execbit !)
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-execbit !)
 
   $ nlinksdir r4
   2 r4/.hg/00changelog.i
@@ -313,7 +314,8 @@ 
   2 r4/d1/data1
   2 r4/d1/f2
   1 r4/f1
-  1 r4/f3
+  1 r4/f3 (execbit !)
+  2 r4/f3 (no-execbit !)
 
 #if hardlink-whitelisted
   $ nlinksdir r4/.hg/undo.backup.dirstate r4/.hg/undo.dirstate