Code Review
/
apex-tripleo-heat-templates.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
0757603
)
Make debugging merge.py in the test suite possible.
author
Robert Collins
<rbtcollins@hp.com>
Tue, 28 Jan 2014 06:19:16 +0000
(19:19 +1300)
committer
Robert Collins
<rbtcollins@hp.com>
Tue, 28 Jan 2014 12:39:27 +0000
(
01:39
+1300)
Change-Id: Ie30f0421601cbd5cf8f88dcc3dcf818b1db589ba
test_merge.bash
patch
|
blob
|
history
diff --git
a/test_merge.bash
b/test_merge.bash
index
2f8a4cc
..
61462f6
100755
(executable)
--- 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