diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-01-28 23:01:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-01-28 23:01:34 +0000 |
| commit | cd9fce908620ccf372806a48ac9e31ebbc812d02 (patch) | |
| tree | dd4a4d7f50cd3c2db796b82300549d68050647c9 | |
| parent | e174686162feb1155f2b01b5fd0f399b197b87b4 (diff) | |
| parent | 23c8aac2bacfee96e0faedb84d0b72893f13c6ec (diff) | |
Merge "Make debugging merge.py in the test suite possible."
| -rwxr-xr-x | test_merge.bash | 2 |
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 |