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.
This commit is contained in:
parent
e602c40d09
commit
7dd3592eab
5 changed files with 60 additions and 0 deletions
|
@ -384,3 +384,15 @@ def test_variant_not_flipped_to_pull_externals(self):
|
||||||
|
|
||||||
assert '~external' in s['vdefault-or-external']
|
assert '~external' in s['vdefault-or-external']
|
||||||
assert 'externaltool' not in s
|
assert 'externaltool' not in s
|
||||||
|
|
||||||
|
@pytest.mark.regression('25585')
|
||||||
|
def test_dependencies_cant_make_version_parent_score_better(self):
|
||||||
|
"""Test that a package can't select a worse version for a
|
||||||
|
dependent because doing so it can pull-in a dependency
|
||||||
|
that makes the overall version score even or better and maybe
|
||||||
|
has a better score in some lower priority criteria.
|
||||||
|
"""
|
||||||
|
s = Spec('version-test-root').concretized()
|
||||||
|
|
||||||
|
assert s.satisfies('^version-test-pkg@2.4.6')
|
||||||
|
assert 'version-test-dependency-preferred' not in s
|
||||||
|
|
|
@ -47,3 +47,5 @@ packages:
|
||||||
externals:
|
externals:
|
||||||
- spec: external-non-default-variant@3.8.7~foo~bar
|
- spec: external-non-default-variant@3.8.7~foo~bar
|
||||||
prefix: /usr
|
prefix: /usr
|
||||||
|
version-test-dependency-preferred:
|
||||||
|
version: ['5.2.5']
|
|
@ -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')
|
|
@ -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'
|
||||||
|
)
|
|
@ -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')
|
Loading…
Reference in a new issue