Patchwork [2,of,2,STABLE] test-tools: update for platforms without symlink support after 5b20e4c32117

login
register
mail settings
Submitter Matt Harbison
Date Jan. 18, 2015, 10:10 p.m.
Message ID <74f3ae15cb0e5554633d.1421619008@Envy>
Download mbox | patch
Permalink /patch/7517/
State Accepted
Commit 5831bef5387f825fbf10f8ef898a5f687c54812b
Headers show

Comments

Matt Harbison - Jan. 18, 2015, 10:10 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1421617136 18000
#      Sun Jan 18 16:38:56 2015 -0500
# Branch stable
# Node ID 74f3ae15cb0e5554633d82ed95262688a7cc774f
# Parent  95dc98ca7b64de3f8a8d1accc464aca2bfc4b698
test-tools: update for platforms without symlink support after 5b20e4c32117

The change was triggered by removing the 'baz' hardlink.
Matt Mackall - Jan. 19, 2015, 12:25 a.m.
On Sun, 2015-01-18 at 17:10 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1421617136 18000
> #      Sun Jan 18 16:38:56 2015 -0500
> # Branch stable
> # Node ID 74f3ae15cb0e5554633d82ed95262688a7cc774f
> # Parent  95dc98ca7b64de3f8a8d1accc464aca2bfc4b698
> test-tools: update for platforms without symlink support after 5b20e4c32117

These are queued for default, thanks.

Patch

diff --git a/tests/test-tools.t b/tests/test-tools.t
--- a/tests/test-tools.t
+++ b/tests/test-tools.t
@@ -94,13 +94,10 @@ 
   0000: 79 61 64 64 61                                  |yadda|
 #else
   $ f -qr dir -HB 17
-  dir: directory with 3 files
+  dir: directory with 2 files\r (esc)
   dir/bar: (glob)
   0000: 31 0a 32 0a 33 0a 34 0a 35 0a 36 0a 37 0a 38 0a |1.2.3.4.5.6.7.8.|
   0010: 39                                              |9|
-  dir/baz: (glob)
-  0000: 31 0a 32 0a 33 0a 34 0a 35 0a 36 0a 37 0a 38 0a |1.2.3.4.5.6.7.8.|
-  0010: 39                                              |9|
   dir/foo: (glob)
   0000: 66 6f 6f 0a                                     |foo.|
 #endif