From c4923fe3b3ee28ac47311411a631b228aaefef38 Mon Sep 17 00:00:00 2001 From: Xavier Delaruelle Date: Fri, 24 Mar 2023 20:38:24 +0100 Subject: modules: add support for append_flags/remove_flags (#36402) Adapt tcl and lmod modulefile templates to generate append-path or remove-path commands in modulefile when respectively append_flags or remove_flags commands are defined in package for run environment. Fixes #10299. --- lib/spack/spack/test/modules/lmod.py | 2 ++ lib/spack/spack/test/modules/tcl.py | 2 ++ 2 files changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/spack/spack/test/modules/lmod.py b/lib/spack/spack/test/modules/lmod.py index f002285ce0..4ac888f2d5 100644 --- a/lib/spack/spack/test/modules/lmod.py +++ b/lib/spack/spack/test/modules/lmod.py @@ -144,6 +144,8 @@ class TestLmod(object): assert len([x for x in content if 'append_path("SEMICOLON", "bar", ";")' in x]) == 1 assert len([x for x in content if 'prepend_path("SEMICOLON", "bar", ";")' in x]) == 1 assert len([x for x in content if 'remove_path("SEMICOLON", "bar", ";")' in x]) == 1 + assert len([x for x in content if 'append_path("SPACE", "qux", " ")' in x]) == 1 + assert len([x for x in content if 'remove_path("SPACE", "qux", " ")' in x]) == 1 @pytest.mark.parametrize("config_name", ["exclude", "blacklist"]) def test_exclude(self, modulefile_content, module_configuration, config_name): diff --git a/lib/spack/spack/test/modules/tcl.py b/lib/spack/spack/test/modules/tcl.py index f289e455e5..f91a55691f 100644 --- a/lib/spack/spack/test/modules/tcl.py +++ b/lib/spack/spack/test/modules/tcl.py @@ -120,6 +120,8 @@ class TestTcl(object): assert len([x for x in content if 'append-path --delim ";" SEMICOLON "bar"' in x]) == 1 assert len([x for x in content if 'prepend-path --delim ";" SEMICOLON "bar"' in x]) == 1 assert len([x for x in content if 'remove-path --delim ";" SEMICOLON "bar"' in x]) == 1 + assert len([x for x in content if 'append-path --delim " " SPACE "qux"' in x]) == 1 + assert len([x for x in content if 'remove-path --delim " " SPACE "qux"' in x]) == 1 @pytest.mark.parametrize("config_name", ["exclude", "blacklist"]) def test_exclude(self, modulefile_content, module_configuration, config_name): -- cgit v1.2.3-60-g2f50