diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2022-11-01 19:04:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-01 19:04:45 +0100 |
| commit | 23aef6bb945dc53d68af85820d7d9653d691e0ad (patch) | |
| tree | 4312e02c4cac3d9ecc0492b0e3023e93692e925e | |
| parent | 973b43b1c1340bd84c4f193f19a6ad01d8de8edb (diff) | |
| download | spack-23aef6bb945dc53d68af85820d7d9653d691e0ad.tar.gz spack-23aef6bb945dc53d68af85820d7d9653d691e0ad.tar.bz2 spack-23aef6bb945dc53d68af85820d7d9653d691e0ad.tar.xz spack-23aef6bb945dc53d68af85820d7d9653d691e0ad.zip | |
Let pytest-cov create the xml directly (#33619)
`coverage` sometimes failed to combine, even if there were multiple reports.
| -rw-r--r-- | .github/workflows/unit_tests.yaml | 8 | ||||
| -rwxr-xr-x | share/spack/qa/run-unit-tests | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index dcebecaeae..80b4593c23 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -89,8 +89,6 @@ jobs: UNIT_TEST_COVERAGE: ${{ (matrix.python-version == '3.10') }} run: | share/spack/qa/run-unit-tests - coverage combine -a - coverage xml - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 with: flags: unittests,linux,${{ matrix.concretizer }} @@ -182,8 +180,6 @@ jobs: SPACK_TEST_SOLVER: clingo run: | share/spack/qa/run-unit-tests - coverage combine -a - coverage xml - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # @v2.1.0 with: flags: unittests,linux,clingo @@ -218,9 +214,7 @@ jobs: $(which spack) bootstrap disable spack-install $(which spack) solve zlib common_args=(--dist loadfile --tx '4*popen//python=./bin/spack-tmpconfig python -u ./bin/spack python' -x) - $(which spack) unit-test --cov --cov-config=pyproject.toml "${common_args[@]}" - coverage combine -a - coverage xml + $(which spack) unit-test --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml "${common_args[@]}" - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 with: flags: unittests,macos diff --git a/share/spack/qa/run-unit-tests b/share/spack/qa/run-unit-tests index 478e582242..842a00caf2 100755 --- a/share/spack/qa/run-unit-tests +++ b/share/spack/qa/run-unit-tests @@ -66,7 +66,7 @@ fi # where it seems that otherwise the configuration file might not be located by subprocesses # in some, not better specified, cases. if [[ "$UNIT_TEST_COVERAGE" == "true" ]]; then - $(which spack) unit-test -x --verbose --cov --cov-config=pyproject.toml + $(which spack) unit-test -x --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml else $(which spack) unit-test -x --verbose fi |