diff options
| author | Barry Haddow <barry.haddow@gmail.com> | 2011-11-29 17:10:29 +0400 |
|---|---|---|
| committer | Barry Haddow <barry.haddow@gmail.com> | 2011-11-29 17:10:29 +0400 |
| commit | de36fafc746e6e2337aed23d11ef282b011b49c4 (patch) | |
| tree | 80d0f64fcffbb2a2af566c1a231eb75a0901fc5e /cruise-control | |
| parent | c09bc0c11cd8ec8ff58a0b3e9f399ca382e09363 (diff) | |
Fix bjam regtest running
Diffstat (limited to 'cruise-control')
| -rwxr-xr-x | cruise-control/test_all_new_commits.sh | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/cruise-control/test_all_new_commits.sh b/cruise-control/test_all_new_commits.sh index 378c7fb56..a774d2013 100755 --- a/cruise-control/test_all_new_commits.sh +++ b/cruise-control/test_all_new_commits.sh @@ -86,15 +86,7 @@ function run_single_test () { err="" - echo "## ./bjam clean" >> $longlog - ./bjam clean >> $longlog 2>&1 || warn "bjam clean failed, suspicious" - - echo "## ./bjam $MCC_CONFIGURE_ARGS" >> $longlog - if [ -z "$err" ]; then - ./bjam $MCC_CONFIGURE_ARGS >> $longlog 2>&1 || err="bjam" - fi - - cd regression-testing + cd regression-testing regtest_file=$(echo "$REGTEST_ARCHIVE" | sed 's/^.*\///') # download data for regression tests if necessary @@ -104,12 +96,22 @@ function run_single_test () { tar xzf $regtest_file touch $regtest_file.ok fi + cd .. + + regtest_dir=$PWD/$(basename $regtest_file .tgz) + echo "## ./bjam clean" >> $longlog + ./bjam clean $MCC_CONFIGURE_ARGS --with-regtest=$regtest_dir >> $longlog 2>&1 || warn "bjam clean failed, suspicious" + + echo "## ./bjam $MCC_CONFIGURE_ARGS" >> $longlog + if [ -z "$err" ]; then + ./bjam $MCC_CONFIGURE_ARGS >> $longlog 2>&1 || err="bjam" + fi + echo "## regression tests" >> $longlog if [ -z "$err" ]; then - ../bjam $MCC_CONFIGURE_ARGS --with-regtest=$PWD/$(basename $regtest_file .tar.gz) >> $longlog 2>&1 || err="regression tests" + ./bjam $MCC_CONFIGURE_ARGS --with-regtest=$regtest_dir >> $longlog 2>&1 || err="regression tests" fi - cd .. if [ -z "$err" ] && [ "$MCC_RUN_EMS" = "yes" ]; then echo "## EMS" >> $longlog |