aboutsummaryrefslogtreecommitdiffstats
path: root/test_merge.bash
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2013-09-25 11:15:59 -0700
committerClint Byrum <clint@fewbar.com>2013-09-30 09:04:07 -0700
commit69f1dcc7cb1f881b9df0d0c5ac0c34627bc1d775 (patch)
treece25b4876111d47dda946d54a7cbdd46fafbcac5 /test_merge.bash
parentfaa7cfbb196f399a41f337d2b21984f9184ed1b5 (diff)
Add recursive whole-file __include__ tag
We can now merge an entire file with minimal effort. Change-Id: If86657fb9f9cca0f048c9e01100a3667597a6596
Diffstat (limited to 'test_merge.bash')
-rw-r--r--test_merge.bash2
1 files changed, 2 insertions, 0 deletions
diff --git a/test_merge.bash b/test_merge.bash
index 004a613e..0eeb2262 100644
--- a/test_merge.bash
+++ b/test_merge.bash
@@ -24,6 +24,8 @@ run_test() {
}
echo
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
echo
trap - EXIT
exit $fail