aboutsummaryrefslogtreecommitdiffstats
path: root/test_merge.bash
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2014-01-28 19:19:16 +1300
committerRobert Collins <rbtcollins@hp.com>2014-01-29 01:39:27 +1300
commit23c8aac2bacfee96e0faedb84d0b72893f13c6ec (patch)
tree1ddb39c9efae96a70952ea698ac3b1a4fa21b8f5 /test_merge.bash
parent0757603f2ec10223a99de17123cfd9c1a6a815af (diff)
Make debugging merge.py in the test suite possible.
Change-Id: Ie30f0421601cbd5cf8f88dcc3dcf818b1db589ba
Diffstat (limited to 'test_merge.bash')
-rwxr-xr-xtest_merge.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/test_merge.bash b/test_merge.bash
index 2f8a4cc9..61462f66 100755
--- a/test_merge.bash
+++ b/test_merge.bash
@@ -12,7 +12,7 @@ run_test() {
local expected=$2
result=$(mktemp /tmp/test_merge.XXXXXX)
fail=0
- $cmd > $result
+ $cmd --output $result
if ! cmp $result $expected ; then
diff -u $expected $result || :
echo FAIL - $cmd result does not match expected