Skip to content

Commit

Permalink
Merge branch 'update_to_fparser_0_2' into more_linker_wrapper_improve…
Browse files Browse the repository at this point in the history
…ments
  • Loading branch information
hiker committed Mar 6, 2025
2 parents e71aba2 + 9675571 commit 7f158aa
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
10 changes: 6 additions & 4 deletions source/fab/tools/tool_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,12 @@ def __init__(self):
Ar, Fcm, Git, Psyclone, Rsync, Subversion]:
self.add_tool(cls())

# Add the common shells. While Fab itself does not need this,
# it is a very convenient tool for user configuration (e.g. to
# query nc-config etc)
for shell_name in ["sh", "bash", "ksh", "dash"]:
# Add a standard shell. Additional shells (bash, ksh, dash)
# can be created by just adding their names to the list. While Fab
# itself does not need this, it is a very convenient tool for user
# configurations (e.g. to query `nf-config` etc), since we don't
# allow a shell to be used in Python's subprocess.
for shell_name in ["sh"]:
self.add_tool(Shell(shell_name))

# Now create the potential mpif90 and Cray ftn wrapper
Expand Down
4 changes: 2 additions & 2 deletions tests/unit_tests/tools/test_tool_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,5 +178,5 @@ def test_tool_repository_no_tool_available():
is_available.return_value = False
with pytest.raises(RuntimeError) as err:
tr.get_default(Category.SHELL)
assert ("Can't find available 'SHELL' tool. Tools are 'sh,bash,ksh,"
"dash'" in str(err.value))
assert ("Can't find available 'SHELL' tool. Tools are 'sh'"
in str(err.value))

0 comments on commit 7f158aa

Please sign in to comment.