Skip to content
Snippets Groups Projects
Commit bb5e9242 authored by Martin Lang's avatar Martin Lang
Browse files

Fix missing spaces

parent 6996f09f
No related branches found
No related tags found
2 merge requests!2Deprecate toolchain metamodules and extend octopus-dependencies,!1Code review of main
Pipeline #530130 failed
......@@ -444,8 +444,8 @@ def generate_meta_modules(
f"The toolchain modules are deprecated; load {hierarchy_modules} and other"
" modules explicitly. For compiling octopus: the octopus-dependencies"
" module in variants min (full) contains all required (required and"
f"optional) dependencies. Use: 'module load {hierarchy_modules}"
"octopus-dependencies/VARIANT'"
f" optional) dependencies. Use: 'module load {hierarchy_modules}"
" octopus-dependencies/VARIANT'"
)
write_lua_module(
Config().lmod_root / "Core" / "toolchain" / f"{toolchain_module_name}.lua",
......
......@@ -416,12 +416,9 @@ def test_install_toolchain(
assert "generating lmod metamodules" in caplog.text
assert f"{TOOLCHAIN}: Installation succeeded" in caplog.text
# not "toolchain" metamodules for new releases
toolchain_module = Config().lmod_root / "Core" / "toolchain" / f"{TOOLCHAIN}.lua"
assert toolchain_module.is_file()
with toolchain_module.open() as f:
content = f.read()
assert f'depends_on("{Config().system_compiler.replace("@", "/")}")' in content
assert "toolchain modules are deprecated" in content
assert not toolchain_module.is_file()
octopus_full_dependencies_module = (
Config().lmod_root
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment