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-02-26 14:23:10 +0000 |
| commit | 7ac781919ae61cfc66bc277edaa34749310b3fee (patch) | |
| tree | 162ea1116a3be1c12c689f0ccb49a19e1528a6a0 /tests/run_tests.sh | |
| parent | 1a50b0ad73c809fd850498fc1a7131559f2f29ec (diff) | |
| download | tbdiff-7ac781919ae61cfc66bc277edaa34749310b3fee.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/run_tests.sh')
| -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..a445733 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 |