build-sys: support 'none' for parallel tests
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
1740d29cdd
commit
571f5f5ba1
|
@ -93,7 +93,7 @@ function check_root
|
||||||
osx_prepare_check
|
osx_prepare_check
|
||||||
|
|
||||||
# TS_OPTS= overwrites default from tests/Makemodule.am
|
# TS_OPTS= overwrites default from tests/Makemodule.am
|
||||||
sudo -E $MAKE check TS_PARALLEL=' ' TS_OPTS="$make_opts" || return
|
sudo -E $MAKE check "TS_PARALLEL=--parallel=none" TS_OPTS="$make_opts" || return
|
||||||
|
|
||||||
# root on osx has not enough permission for make install ;)
|
# root on osx has not enough permission for make install ;)
|
||||||
[ "$TRAVIS_OS_NAME" = "osx" ] && return
|
[ "$TRAVIS_OS_NAME" = "osx" ] && return
|
||||||
|
|
|
@ -93,7 +93,9 @@ while [ -n "$1" ]; do
|
||||||
;;
|
;;
|
||||||
--parallel=*)
|
--parallel=*)
|
||||||
paraller_jobs="${1##--parallel=}"
|
paraller_jobs="${1##--parallel=}"
|
||||||
if ! [ "$paraller_jobs" -ge 0 ] 2>/dev/null; then
|
if [ "$paraller_jobs" = "none" ]; then
|
||||||
|
paraller_jobs=1
|
||||||
|
elif ! [ "$paraller_jobs" -ge 0 ] 2>/dev/null; then
|
||||||
echo "invalid argument '$paraller_jobs' for --parallel="
|
echo "invalid argument '$paraller_jobs' for --parallel="
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -121,7 +123,7 @@ while [ -n "$1" ]; do
|
||||||
echo " --noskip-commands fail on missing commands"
|
echo " --noskip-commands fail on missing commands"
|
||||||
echo " --srcdir=<path> autotools top source directory"
|
echo " --srcdir=<path> autotools top source directory"
|
||||||
echo " --builddir=<path> autotools top build directory"
|
echo " --builddir=<path> autotools top build directory"
|
||||||
echo " --parallel=<num> number of parallel test jobs, default: num cpus"
|
echo " --parallel=<num|none> number of parallel test jobs, default: num cpus"
|
||||||
echo " --exclude=<list> exclude tests by list '<utilname>/<testname> ..'"
|
echo " --exclude=<list> exclude tests by list '<utilname>/<testname> ..'"
|
||||||
echo
|
echo
|
||||||
exit 1
|
exit 1
|
||||||
|
|
Loading…
Reference in New Issue