zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(to be removed) Make spack unit test runnable

Browse Source
This commit is contained in:
Massimiliano Culpo 2024-08-29 10:03:21 +02:00
parent 8b2809b4ac
commit ca6f74d3bf
No known key found for this signature in database
GPG Key ID: 3E52BB992233066C
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/unit_tests.yaml vendored
View File

@ -61,7 +61,7 @@ jobs:
run: "brew install kcov" run: "brew install kcov"
- name: Install Python packages - name: Install Python packages
run: | run: |
pip install --upgrade pip setuptools pytest pytest-xdist pytest-cov pip install --upgrade pip setuptools pytest pytest-xdist pytest-cov clingo
pip install --upgrade flake8 "isort>=4.3.5" "mypy>=0.900" "click" "black" pip install --upgrade flake8 "isort>=4.3.5" "mypy>=0.900" "click" "black"
- name: Setup git configuration - name: Setup git configuration
run: | run: |
@ -185,7 +185,6 @@ jobs:
spack bootstrap disable github-actions-v0.5 spack bootstrap disable github-actions-v0.5
spack bootstrap disable github-actions-v0.6 spack bootstrap disable github-actions-v0.6
spack bootstrap status spack bootstrap status
spack solve zlib
spack unit-test --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml lib/spack/spack/test/concretization/core.py spack unit-test --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml lib/spack/spack/test/concretization/core.py
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
with: with:
@ -223,7 +222,7 @@ jobs:
. share/spack/setup-env.sh . share/spack/setup-env.sh
$(which spack) bootstrap disable spack-install $(which spack) bootstrap disable spack-install
$(which spack) solve zlib $(which spack) solve zlib
common_args=(--dist loadfile --tx '4*popen//python=./bin/spack-tmpconfig python -u ./bin/spack python' -x) common_args=(--dist loadfile --tx '4*popen//python=./bin/spack-tmpconfig python -u ./bin/spack python')
$(which spack) unit-test --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml "${common_args[@]}" $(which spack) unit-test --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml "${common_args[@]}"
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
with: with:
@ -254,7 +253,7 @@ jobs:
env: env:
COVERAGE_FILE: coverage/.coverage-windows COVERAGE_FILE: coverage/.coverage-windows
run: | run: |
spack unit-test -x --verbose --cov --cov-config=pyproject.toml spack unit-test --verbose --cov --cov-config=pyproject.toml
./share/spack/qa/validate_last_exit.ps1 ./share/spack/qa/validate_last_exit.ps1
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
with: with:

2
lib/spack/spack/cmd/unit_test.py
View File

@ -216,7 +216,7 @@ def unit_test(parser, args, unknown_args):
# Ensure clingo is available before switching to the # Ensure clingo is available before switching to the
# mock configuration used by unit tests # mock configuration used by unit tests
with spack.bootstrap.ensure_bootstrap_configuration(): with spack.bootstrap.ensure_bootstrap_configuration():
spack.bootstrap.ensure_core_dependencies() spack.bootstrap.ensure_clingo_importable_or_raise()
if pytest is None: if pytest is None:
spack.bootstrap.ensure_environment_dependencies() spack.bootstrap.ensure_environment_dependencies()
import pytest import pytest

4
share/spack/qa/run-unit-tests
View File

@ -60,9 +60,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 --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml
else else
"$(which spack)" unit-test -x --verbose "$(which spack)" unit-test --verbose
fi fi