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-24 17:21:09 +0000 |
| commit | dbc9c1ca3b909ab990b705ad83ddc81344077117 (patch) | |
| tree | c3b522c24c07a86b58a25d789c371ed7c16d219d /tests | |
| parent | ce2edcba92731c0a83fe59133b64d67afc59212a (diff) | |
| download | tbdiff-dbc9c1ca3b909ab990b705ad83ddc81344077117.tar.gz | |
Modify 'baserock-system-config-sync' to get two arguments using 'merge'baserock/pedroalvarez/system-version-manager3
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 36dff01..a2c8d76 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -56,7 +56,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 @@ -78,7 +78,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 |