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

Ensure "spack unit-test" can bootstrap clingo (#28572)

Browse Source
This commit is contained in:
Massimiliano Culpo 2022-01-26 14:19:15 +01:00 committed by GitHub
parent b700335be7
commit 3cf5df7e3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@
import llnl.util.tty.color as color import llnl.util.tty.color as color
from llnl.util.tty.colify import colify from llnl.util.tty.colify import colify
import spack.bootstrap
import spack.paths import spack.paths
description = "run spack's unit tests (wrapper around pytest)" description = "run spack's unit tests (wrapper around pytest)"
@ -175,6 +176,12 @@ def add_back_pytest_args(args, unknown_args):
def unit_test(parser, args, unknown_args): def unit_test(parser, args, unknown_args):
global pytest global pytest
# Ensure clingo is available before switching to the
# mock configuration used by unit tests
with spack.bootstrap.ensure_bootstrap_configuration():
spack.bootstrap.ensure_clingo_importable_or_raise()
if pytest is None: if pytest is None:
vendored_pytest_dir = os.path.join( vendored_pytest_dir = os.path.join(
spack.paths.external_path, 'pytest-fallback' spack.paths.external_path, 'pytest-fallback'

2
lib/spack/spack/test/data/config/bootstrap.yaml
View File

@ -6,7 +6,7 @@ bootstrap:
Buildcache generated from a public workflow using Github Actions. Buildcache generated from a public workflow using Github Actions.
The sha256 checksum of binaries is checked before installation. The sha256 checksum of binaries is checked before installation.
info: info:
url: file:///home/culpo/production/spack/mirrors/clingo url: file:///home/spack/production/spack/mirrors/clingo
homepage: https://github.com/alalazo/spack-bootstrap-mirrors homepage: https://github.com/alalazo/spack-bootstrap-mirrors
releases: https://github.com/alalazo/spack-bootstrap-mirrors/releases releases: https://github.com/alalazo/spack-bootstrap-mirrors/releases
trusted: {} trusted: {}