diff options
Diffstat (limited to 'test_merge.bash')
| -rwxr-xr-x | test_merge.bash | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test_merge.bash b/test_merge.bash index 2f8a4cc9..f9bc7fb6 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 @@ -28,6 +28,7 @@ run_test "python $merge_py examples/source.yaml" examples/source_lib_result.yaml run_test "python $merge_py examples/source2.yaml" examples/source2_lib_result.yaml run_test "python $merge_py examples/source_include_subkey.yaml" examples/source_include_subkey_result.yaml run_test "python $merge_py examples/launchconfig1.yaml examples/launchconfig2.yaml" examples/launchconfig_result.yaml +run_test "python $merge_py --scale NovaCompute=3 examples/scale1.yaml" examples/scale_result.yaml echo trap - EXIT exit $fail |