Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace run_cmd with run_shell_cmd in custom easyblock for TINKER (tinker.py) #3180

Merged
merged 1 commit into from
Feb 8, 2024
Merged

replace run_cmd with run_shell_cmd in custom easyblock for TINKER (tinker.py) #3180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions easybuild/easyblocks/t/tinker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.filetools import apply_regex_substitutions, change_dir, copy_dir, copy_file, mkdir
from easybuild.tools.modules import get_software_root
from easybuild.tools.run import run_cmd
from easybuild.tools.run import run_shell_cmd
from easybuild.tools.systemtools import DARWIN, LINUX, get_os_type


Expand Down Expand Up @@ -97,9 +97,8 @@ def build_step(self):

change_dir(os.path.join(self.cfg['start_dir'], 'source'))

run_cmd(os.path.join(self.cfg['start_dir'], self.build_subdir, 'compile.make'))
run_cmd(os.path.join(self.cfg['start_dir'], self.build_subdir, 'library.make'))
run_cmd(os.path.join(self.cfg['start_dir'], self.build_subdir, 'link.make'))
for make in ['compile', 'library', 'link']:
run_shell_cmd(os.path.join(self.cfg['start_dir'], self.build_subdir, f'{make}.make'))

def test_step(self):
"""Custom built-in test procedure for TINKER."""
Expand Down Expand Up @@ -132,15 +131,15 @@ def test_step(self):
tests = [t for t in tests if not any([t.endswith('%s.run' % x) for x in skip_tests])]

for test in tests:
run_cmd(test)
run_shell_cmd(test)

def install_step(self):
"""Custom install procedure for TINKER."""

change_dir(os.path.join(self.cfg['start_dir'], 'source'))

mkdir(os.path.join(self.cfg['start_dir'], 'bin'))
run_cmd(os.path.join(self.cfg['start_dir'], self.build_subdir, 'rename.make'))
run_shell_cmd(os.path.join(self.cfg['start_dir'], self.build_subdir, 'rename.make'))

def sanity_check_step(self):
"""Custom sanity check for TINKER."""
Expand Down
Loading