diff options
| author | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-12-08 15:56:55 +0300 |
|---|---|---|
| committer | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-12-08 15:56:55 +0300 |
| commit | fdb5d9b282fe51fecca14f3d6226eb5980fbe6f5 (patch) | |
| tree | 0bef491d0d2344e43cd5f407357cb3e79ada3d04 /run-regtests.sh | |
| parent | 9528b56242de61c824b15e790cf4abe72e2ceb66 (diff) | |
Code refactoring: All FF now get access to AllOptions at load time, so they don't have to rely on StaticData.
Diffstat (limited to 'run-regtests.sh')
| -rwxr-xr-x | run-regtests.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/run-regtests.sh b/run-regtests.sh index 3fbdc0caf..3d93741d5 100755 --- a/run-regtests.sh +++ b/run-regtests.sh @@ -6,7 +6,7 @@ set -e -o pipefail opt=$(pwd)/opt -args=$(getopt -oj:aq -lwith-irstlm:,with-boost:,with-cmph:,with-regtest:,no-server,with-xmlrpc-c:,full -- "$@") +args=$(getopt -oj:aq -lwith-irstlm:,with-boost:,with-cmph:,with-regtest:,no-xmlrpc-c,with-xmlrpc-c:,full -- "$@") eval set -- "$args" # default settings @@ -16,7 +16,7 @@ j=$(getconf _NPROCESSORS_ONLN) irstlm=$opt boost=$opt cmph=$opt -xmlrpc=$opt +xmlrpc=--with-xmlrpc-c\=$opt regtest=$(pwd)/regtest unset q unset a @@ -30,12 +30,13 @@ while true ; do -j ) j=$2; shift 2 ;; -a ) a=-a; shift ;; -q ) q=-q; shift ;; + --no-xmlrpc-c ) xmlrpc=$1; shift ;; + --with-xmlrpc-c ) + xmlrpc=--with-xmlrpc-c\=$2; shift 2 ;; --with-irstlm ) irstlm=$2; shift 2 ;; --with-boost ) boost=$2; shift 2 ;; --with-cmph ) cmph=$2; shift 2 ;; --with-regtest ) regtest=$2; shift 2 ;; - --no-server ) noserver=true; shift 2 ;; - --with-xmlrpc-c ) xmlrpc=$2; shift 2 ;; --full ) full=true; shift 2 ;; -- ) shift; break ;; * ) break ;; @@ -54,14 +55,14 @@ set -x if [ "$full" == true ] ; then ./bjam -j$j --with-irstlm=$irstlm --with-boost=$boost --with-cmph=$cmph --no-xmlrpc-c --with-regtest=$regtest -a $skipcompact $@ $q || exit $? if ./regression-testing/run-single-test.perl --server --startuptest ; then - ./bjam -j$j --with-irstlm=$irstlm --with-boost=$boost --with-cmph=$cmph --with-xmlrpc-c=$xmlrpc --with-regtest=$regtest -a $skipcompact $@ $q + ./bjam -j$j --with-irstlm=$irstlm --with-boost=$boost --with-cmph=$cmph $xmlrpc --with-regtest=$regtest -a $skipcompact $@ $q fi else # when investigating failures, always run single-threaded if [ "$q" == "-q" ] ; then j=1; fi if ./regression-testing/run-single-test.perl --server --startuptest ; then - ./bjam -j$j $q $a --with-irstlm=$irstlm --with-boost=$boost --with-cmph=$cmph --with-xmlrpc-c=$xmlrpc --with-regtest=$regtest $skipcompact $@ + ./bjam -j$j $q $a --with-irstlm=$irstlm --with-boost=$boost --with-cmph=$cmph $xmlrpc --with-regtest=$regtest $skipcompact $@ else ./bjam -j$j $q $a --with-irstlm=$irstlm --with-boost=$boost --with-cmph=$cmph --no-xmlrpc-c --with-regtest=$regtest $skipcompact $@ fi |