diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml index 292d2f43..5bbbf8e8 100644 --- a/.github/workflows/MacOS.yml +++ b/.github/workflows/MacOS.yml @@ -554,7 +554,7 @@ jobs: echo ::endgroup:: echo ::group::Run complete test suite set -o pipefail - python -m pytest -v -ra | tee complete_testrun.log 2>&1 + python -m pytest -v -ra -n ${{ env.ncpus }} | tee complete_testrun.log 2>&1 set +o pipefail echo ::group::Crashing Test Logs # See if we don't have a crash that went away diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml index c1732e03..73389176 100644 --- a/.github/workflows/Ubuntu.yml +++ b/.github/workflows/Ubuntu.yml @@ -570,13 +570,13 @@ jobs: echo ::endgroup:: echo ::group::Run complete test suite set -o pipefail - python -m pytest -v -ra | tee complete_testrun.log 2>&1 + python -m pytest -v -ra -n ${{ env.ncpus }}| tee complete_testrun.log 2>&1 set +o pipefail echo ::group::Crashing Test Logs # See if we don't have a crash that went away # Comment out all xfails but the ones that have a run=False condition. find . -name "*.py" -exec sed -i '/run=False/!s/^ *@mark.xfail\(.*\)/#&/' {} \; - python -m pytest -n 1 -m "xfail" --runxfail -v -ra --max-worker-restart 512 | tee test_crashed.log 2>&1 || true + python -m pytest -n ${{ env.ncpus }} -m "xfail" --runxfail -v -ra --max-worker-restart 512 | tee test_crashed.log 2>&1 || true git checkout . echo ::endgroup:: echo ::group::XFAIL Test Logs @@ -610,7 +610,7 @@ jobs: fi export IS_VALGRIND=true if [[ "${{ matrix.Valgrind }}" == "On" ]]; then - valgrind --show-error-list=yes --error-exitcode=1 --track-origins=yes --gen-suppressions=all --suppressions="${SUPPRESSION_FILE}" --suppressions=../etc/valgrind-cppyy-cling.supp python -m pytest -m "not xfail" -v -ra --ignore=test_leakcheck.py + valgrind --show-error-list=yes --error-exitcode=1 --track-origins=yes --gen-suppressions=all --suppressions="${SUPPRESSION_FILE}" --suppressions=../etc/valgrind-cppyy-cling.supp python -m pytest -m "not xfail" -v -ra -n ${{ env.ncpus }} --ignore=test_leakcheck.py fi export RETCODE=+$? unset IS_VALGRIND