zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try renaming dir

Browse Source
This commit is contained in:
psakiev 2023-01-09 16:10:25 -07:00
parent 8cc69cecfc
commit 8d8e88c177
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/spack/spack/test/cmd/env.py
View File

@ -3191,9 +3191,10 @@ def test_environment_created_in_users_location(mutable_config, tmpdir):
assert tmpdir.strpath in env_dir assert tmpdir.strpath in env_dir
assert not os.path.isdir(env_dir) assert not os.path.isdir(env_dir)
env("create", "test") dir_name = "user_env"
env("create", dir_name)
out = env("list") out = env("list")
assert "test" in out assert dir_name in out
assert env_dir in ev.root("test") assert env_dir in ev.root(dir_name)
assert os.path.isdir(os.path.join(env_dir, "test")) assert os.path.isdir(os.path.join(env_dir, dir_name))

1
var/spack/repos/builtin/packages/trilinos/package.py
View File

@ -217,6 +217,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
# ###################### Conflicts ########################## # ###################### Conflicts ##########################
conflicts("~hdf5", when="+exodus")
# Epetra stack # Epetra stack
with when("~epetra"): with when("~epetra"):
conflicts("+amesos") conflicts("+amesos")