From d87158a80f63ee04e3d567c319e1702a75f93bd1 Mon Sep 17 00:00:00 2001 From: Gregory Becker Date: Fri, 28 Mar 2025 13:42:40 -0500 Subject: [PATCH] more robust buildcache tests for concretization to non-default arch Signed-off-by: Gregory Becker --- lib/spack/spack/test/bindist.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/spack/spack/test/bindist.py b/lib/spack/spack/test/bindist.py index 9278d9bf1d8..dee9af6a7de 100644 --- a/lib/spack/spack/test/bindist.py +++ b/lib/spack/spack/test/bindist.py @@ -231,13 +231,13 @@ def test_default_rpaths_create_install_default_layout(temporary_mirror_dir): uninstall_cmd("-y", "--dependents", gspec.name) # Test installing from build caches - buildcache_cmd("install", "-u", cspec.name, sy_spec.name) + buildcache_cmd("install", "-uo", cspec.name, sy_spec.name) # This gives warning that spec is already installed - buildcache_cmd("install", "-u", cspec.name) + buildcache_cmd("install", "-uo", cspec.name) # Test overwrite install - buildcache_cmd("install", "-fu", cspec.name) + buildcache_cmd("install", "-fuo", cspec.name) buildcache_cmd("keys", "-f") buildcache_cmd("list") @@ -263,10 +263,10 @@ def test_default_rpaths_install_nondefault_layout(temporary_mirror_dir): # Install some packages with dependent packages # test install in non-default install path scheme - buildcache_cmd("install", "-u", cspec.name, sy_spec.name) + buildcache_cmd("install", "-uo", cspec.name, sy_spec.name) # Test force install in non-default install path scheme - buildcache_cmd("install", "-uf", cspec.name) + buildcache_cmd("install", "-ufo", cspec.name) @pytest.mark.requires_executables(*required_executables) @@ -288,19 +288,19 @@ def test_relative_rpaths_install_default_layout(temporary_mirror_dir): cspec = spack.concretize.concretize_one("corge") # Install buildcache created with relativized rpaths - buildcache_cmd("install", "-uf", cspec.name) + buildcache_cmd("install", "-ufo", cspec.name) # This gives warning that spec is already installed - buildcache_cmd("install", "-uf", cspec.name) + buildcache_cmd("install", "-ufo", cspec.name) # Uninstall the package and deps uninstall_cmd("-y", "--dependents", gspec.name) # Install build cache - buildcache_cmd("install", "-uf", cspec.name) + buildcache_cmd("install", "-ufo", cspec.name) # Test overwrite install - buildcache_cmd("install", "-uf", cspec.name) + buildcache_cmd("install", "-ufo", cspec.name) @pytest.mark.requires_executables(*required_executables) @@ -317,7 +317,7 @@ def test_relative_rpaths_install_nondefault(temporary_mirror_dir): cspec = spack.concretize.concretize_one("corge") # Test install in non-default install path scheme and relative path - buildcache_cmd("install", "-uf", cspec.name) + buildcache_cmd("install", "-ufo", cspec.name) def test_push_and_fetch_keys(mock_gnupghome, tmp_path):