Patchwork test: make test-extdiff resilient to /usr/bin/echo

login
register
mail settings
Submitter Pierre-Yves David
Date Jan. 30, 2015, 9:51 p.m.
Message ID <d03af1b0a87778304a09.1422654691@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/7583/
State Accepted
Commit e484546a7c18293e5e3f9d883850b81265801c4f
Headers show

Comments

Pierre-Yves David - Jan. 30, 2015, 9:51 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1422654030 0
#      Fri Jan 30 21:40:30 2015 +0000
# Branch stable
# Node ID d03af1b0a87778304a0995bec2757d257b2e81e3
# Parent  6becb9dbca25057c6186e255a48dd2c2ce5701a5
test: make test-extdiff resilient to /usr/bin/echo

My test machine have 'echo' in '/usb/bin/echo', #dontaskmewhy.
Matt Mackall - Feb. 1, 2015, 8:13 p.m.
On Fri, 2015-01-30 at 21:51 +0000, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1422654030 0
> #      Fri Jan 30 21:40:30 2015 +0000
> # Branch stable
> # Node ID d03af1b0a87778304a0995bec2757d257b2e81e3
> # Parent  6becb9dbca25057c6186e255a48dd2c2ce5701a5
> test: make test-extdiff resilient to /usr/bin/echo

Huh. Ok, queued.

Patch

diff --git a/tests/test-extdiff.t b/tests/test-extdiff.t
--- a/tests/test-extdiff.t
+++ b/tests/test-extdiff.t
@@ -177,11 +177,11 @@  Test pre-72a89cf86fcd backward compatibi
   > EOF
 #if windows
 TODO
 #else
   $ hg --debug odd | grep '^running'
-  running "/bin/echo --foo='sp ace' 'sp ace' --bar='sp ace' 'sp ace'" in * (glob)
+  running "*/bin/echo --foo='sp ace' 'sp ace' --bar='sp ace' 'sp ace'" in * (glob)
 #endif
 
 #if execbit
 
 Test extdiff of multiple files in tmp dir: