run-unit-tests: no xdist if coverage (#46480)

xdist only slows down unit tests under coverage
This commit is contained in:
Harmen Stoppels 2024-09-19 14:01:33 +02:00 committed by GitHub
parent 7395656663
commit b1db22d406
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -47,7 +47,7 @@ $coverage_run $(which spack) python -c "import spack.pkg.builtin.mpileaks; repr(
# Run unit tests with code coverage # Run unit tests with code coverage
#----------------------------------------------------------- #-----------------------------------------------------------
# Check if xdist is available # Check if xdist is available
if python -m pytest -VV 2>&1 | grep xdist; then if [[ "$UNIT_TEST_COVERAGE" != "true" ]] && python -m pytest -VV 2>&1 | grep xdist; then
export PYTEST_ADDOPTS="$PYTEST_ADDOPTS --dist loadfile --tx '${SPACK_TEST_PARALLEL:=3}*popen//python=./bin/spack-tmpconfig python -u ./bin/spack python'" export PYTEST_ADDOPTS="$PYTEST_ADDOPTS --dist loadfile --tx '${SPACK_TEST_PARALLEL:=3}*popen//python=./bin/spack-tmpconfig python -u ./bin/spack python'"
fi fi
@ -61,9 +61,9 @@ fi
# where it seems that otherwise the configuration file might not be located by subprocesses # where it seems that otherwise the configuration file might not be located by subprocesses
# in some, not better specified, cases. # in some, not better specified, cases.
if [[ "$UNIT_TEST_COVERAGE" == "true" ]]; then if [[ "$UNIT_TEST_COVERAGE" == "true" ]]; then
$(which spack) unit-test -x --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml "$(which spack)" unit-test -x --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml
else else
$(which spack) unit-test -x --verbose "$(which spack)" unit-test -x --verbose
fi fi