diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2021-08-26 18:28:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-26 09:28:47 -0700 |
| commit | 7dd3592eabe2b1ab2739a3e54c5228465c4c6ae7 (patch) | |
| tree | d5ff27e4465846f503aed75c4acbe22e94abd7e3 /var | |
| parent | e602c40d09e9b398e227a66838750f24c9dc1a5f (diff) | |
| download | spack-7dd3592eabe2b1ab2739a3e54c5228465c4c6ae7.tar.gz spack-7dd3592eabe2b1ab2739a3e54c5228465c4c6ae7.tar.bz2 spack-7dd3592eabe2b1ab2739a3e54c5228465c4c6ae7.tar.xz spack-7dd3592eabe2b1ab2739a3e54c5228465c4c6ae7.zip | |
Regression test for version selection with preferences (#25602)
This commit adds a regression test for version selection
with preferences in `packages.yaml`. Before PR 25585 we
used negative weights in a minimization to select the
optimal version. This may lead to situations where a
dependency may make the version score of dependents
"better" if it is preferred in packages.yaml.
Diffstat (limited to 'var')
3 files changed, 46 insertions, 0 deletions
diff --git a/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py b/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py new file mode 100644 index 0000000000..672e4e64c4 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py @@ -0,0 +1,16 @@ +# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +class VersionTestDependencyPreferred(AutotoolsPackage): + """Dependency of version-test-pkg, which has a multi-valued + variant with two default values (a very low priority optimization + criterion for clingo is to maximize their number) + """ + homepage = "http://www.spack.org" + url = "http://www.spack.org/downloads/xz-1.0.tar.gz" + + version('5.2.5', sha256='5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df') + + variant('libs', default='shared,static', values=('shared', 'static'), + multi=True, description='Build shared libs, static libs or both') diff --git a/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py b/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py new file mode 100644 index 0000000000..5d2cd4b5cf --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +class VersionTestPkg(AutotoolsPackage): + """Mock AutotoolsPackage to check proper version + selection by clingo. + """ + homepage = "https://www.gnu.org/software/make/" + url = "http://www.example.com/libtool-version-1.0.tar.gz" + + version('develop', git='https://git.savannah.gnu.org/git/libtool.git', + branch='master', submodules=True) + version('2.4.6', sha256='e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7') + + depends_on( + 'version-test-dependency-preferred', + when='@develop' + ) diff --git a/var/spack/repos/builtin.mock/packages/version-test-root/package.py b/var/spack/repos/builtin.mock/packages/version-test-root/package.py new file mode 100644 index 0000000000..e91a868740 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/version-test-root/package.py @@ -0,0 +1,11 @@ +# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +class VersionTestRoot(AutotoolsPackage): + """Uses version-test-pkg, as a build dependency""" + homepage = "http://www.spack.org" + url = "http://www.spack.org/downloads/aml-1.0.tar.gz" + + version('0.1.0', sha256='cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b') + depends_on('version-test-pkg', type='build') |