more robust buildcache tests for concretization to non-default arch
Signed-off-by: Gregory Becker <becker33@llnl.gov>
This commit is contained in:
parent
441efad2d5
commit
d87158a80f
@ -231,13 +231,13 @@ def test_default_rpaths_create_install_default_layout(temporary_mirror_dir):
|
|||||||
uninstall_cmd("-y", "--dependents", gspec.name)
|
uninstall_cmd("-y", "--dependents", gspec.name)
|
||||||
|
|
||||||
# Test installing from build caches
|
# 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
|
# This gives warning that spec is already installed
|
||||||
buildcache_cmd("install", "-u", cspec.name)
|
buildcache_cmd("install", "-uo", cspec.name)
|
||||||
|
|
||||||
# Test overwrite install
|
# Test overwrite install
|
||||||
buildcache_cmd("install", "-fu", cspec.name)
|
buildcache_cmd("install", "-fuo", cspec.name)
|
||||||
|
|
||||||
buildcache_cmd("keys", "-f")
|
buildcache_cmd("keys", "-f")
|
||||||
buildcache_cmd("list")
|
buildcache_cmd("list")
|
||||||
@ -263,10 +263,10 @@ def test_default_rpaths_install_nondefault_layout(temporary_mirror_dir):
|
|||||||
|
|
||||||
# Install some packages with dependent packages
|
# Install some packages with dependent packages
|
||||||
# test install in non-default install path scheme
|
# 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
|
# 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)
|
@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")
|
cspec = spack.concretize.concretize_one("corge")
|
||||||
|
|
||||||
# Install buildcache created with relativized rpaths
|
# 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
|
# 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 the package and deps
|
||||||
uninstall_cmd("-y", "--dependents", gspec.name)
|
uninstall_cmd("-y", "--dependents", gspec.name)
|
||||||
|
|
||||||
# Install build cache
|
# Install build cache
|
||||||
buildcache_cmd("install", "-uf", cspec.name)
|
buildcache_cmd("install", "-ufo", cspec.name)
|
||||||
|
|
||||||
# Test overwrite install
|
# Test overwrite install
|
||||||
buildcache_cmd("install", "-uf", cspec.name)
|
buildcache_cmd("install", "-ufo", cspec.name)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.requires_executables(*required_executables)
|
@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")
|
cspec = spack.concretize.concretize_one("corge")
|
||||||
|
|
||||||
# Test install in non-default install path scheme and relative path
|
# 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):
|
def test_push_and_fetch_keys(mock_gnupghome, tmp_path):
|
||||||
|
Loading…
Reference in New Issue
Block a user