未验证 提交 e2d4033c 编写于 作者: A Amador Pahim

Merge branch 'ldoktor-parallel'

Signed-off-by: NAmador Pahim <apahim@redhat.com>
......@@ -55,7 +55,7 @@ script:
echo
echo
git checkout $COMMIT || ERR=$(echo -e "$ERR\nUnable to checkout $(git log -1 --oneline $COMMIT)")
AVOCADO_LOG_DEBUG=yes AVOCADO_RESULTSDIR_CHECK=y SELF_CHECK_CONTINUOUS=y AVOCADO_CHECK_LEVEL=1 make check || ERR=$(echo -e "$ERR\nmake check of $(git log -1 --oneline) failed")
AVOCADO_PARALLEL_CHECK=yes AVOCADO_LOG_DEBUG=yes AVOCADO_RESULTSDIR_CHECK=y SELF_CHECK_CONTINUOUS=y AVOCADO_CHECK_LEVEL=1 make check || ERR=$(echo -e "$ERR\nmake check of $(git log -1 --oneline) failed")
make clean
done
if [ "$ERR" ]; then
......
......@@ -22,7 +22,7 @@ run_rc() {
parallel_selftests() {
local START=$(date +%s)
local ERR=0
local FIND_UNITTESTS=$(realpath ./contrib/scripts/avocado-find-unittests)
local FIND_UNITTESTS=$(readlink -f ./contrib/scripts/avocado-find-unittests)
local NO_WORKERS=$(($(cat /proc/cpuinfo | grep -c processor) * 2))
# The directories that may contain files with tests, from the Avocado core
......@@ -90,7 +90,7 @@ parallel_selftests() {
fi
done
if [ ${#FAILED_ONCE[@]} -gt 0 ]; then
if [ ${#FAILED_ONCE[@]} -le 10 ]; then
if [ ${#FAILED_ONCE[@]} -le 24 ]; then
echo ${#FAILED_ONCE[@]} failed during parallel execution, trying them in series
echo "python -m unittest --failfast ${FAILED_ONCE[@]}"
if python -m unittest --failfast ${FAILED_ONCE[@]}; then
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册