From 1d441c1a7adf6df562c752e10f139c8916d9786c Mon Sep 17 00:00:00 2001 From: Philip Sakievich Date: Tue, 1 Apr 2025 14:02:59 -0600 Subject: [PATCH] Rework test --- lib/spack/spack/test/packages.py | 2 +- .../packages/git-ref-commit-dep/package.py | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin.mock/packages/git-ref-commit-dep/package.py diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index 019cfd8e349..5e197398ae3 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -350,5 +350,5 @@ def test_phil_package_condtional_variants_may_depend_on_commit(mock_packages, co def test_phil_commit_variant_finds_matches_for_commit_versions(mock_packages, config): - spec = spack.concretize.concretize_one(Spec(f"git-ref-commit-dep commit={'c' * 40}")) + spec = spack.concretize.concretize_one(Spec("git-ref-commit-dep+commit-selector")) assert spec.satisfies("^git-ref-package@stable") diff --git a/var/spack/repos/builtin.mock/packages/git-ref-commit-dep/package.py b/var/spack/repos/builtin.mock/packages/git-ref-commit-dep/package.py new file mode 100644 index 00000000000..3f1122aa45d --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/git-ref-commit-dep/package.py @@ -0,0 +1,24 @@ +# Copyright Spack Project Developers. See COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class GitRefCommitDep(AutotoolsPackage): + """ + tests dependency using commit + """ + + homepage = "https://github.com/dummy/dummy" + git = "https://github.com/dummy/dummy.git" + url = git + + version("develop", branch="develop") + version("1.0.0", sha256="a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2") + + variant("commit-selector", default=False, description="test grabbing a specific commit") + + depends_on(f"git-ref-package commit={'a' * 40}", when="@1.0.0") + depends_on(f"git-ref-package commit={'b' * 40}", when="@develop") + depends_on(f"git-ref-package commit={'c' * 40}", when="+commit-selector")