diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-20 18:42:15 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-03-06 15:34:13 +0000 |
commit | 2c6259f156087e2b99d02666c5323d598aca9f45 (patch) | |
tree | 921cfda7f7a6c42c9321718031f339faf16f76c8 /tests | |
parent | d8532bc2f93a80b5be8701955e668787be41ac3e (diff) | |
download | tbdiff-2c6259f156087e2b99d02666c5323d598aca9f45.tar.gz |
Modify 'baserock-system-config-sync' to get two arguments using 'merge'
Since with 'system-version-manager' is possible to change
the default system, 'baserock-system-config-sync' shouldn't
get the default system, and get an extra parameter to choose
the system version to merge.
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/run_tests.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 102aea6..d460bf7 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -53,7 +53,7 @@ for folder in "$merge_pass_folder/"*.in; do TMPDIR=$(mktemp -d) TMPDIR=$TMPDIR mounting_script="./fake_mounting_script.sh" unmount=true \ mounting_script_test_dir="$folder" "$bscs_script" "merge" \ - "version2" &>> "$bscs_log" + "default" "version2" &>> "$bscs_log" exit_code="$?" if [ "$exit_code" -ne 0 ]; then echo ": FAILED (exit code "$exit_code")" 1>&2 @@ -75,7 +75,7 @@ for folder in "$merge_fail_folder/"*.in; do TMPDIR=$(mktemp -d) TMPDIR=$TMPDIR mounting_script="./fake_mounting_script.sh" unmount=true \ mounting_script_test_dir="$folder" "$bscs_script" "merge" \ - "version2" &>> "$bscs_log" + "default" "version2" &>> "$bscs_log" if [ $? -eq 0 ]; then echo ": FAILED" 1>&2 exit 1 |