diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-03-06 16:51:24 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-03-06 16:51:24 +0000 |
| commit | 485e76fea076b2a5f0efeab3ac7f98037f4e00c0 (patch) | |
| tree | 20203fdb48138d1cb2fb1530ec765c5faa04bbdd /tests/run_tests.sh | |
| parent | f585763060076fdd5104409554613b9ca110f910 (diff) | |
| parent | 1db1e045a3ce3d505718572ca14546bb4273e7a3 (diff) | |
| download | tbdiff-485e76fea076b2a5f0efeab3ac7f98037f4e00c0.tar.gz | |
Merge branch 'baserock/pedroalvarez/trove-upgrades-rebase2'
Reviewed-by: Richard Maw
Reviewed-by: Lars Wirzenius
Reviewed-by: Sam Thursfield
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..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 |