Skip to content

[bugfix] Define the set of run environments correctly when -p option is used with regular expressions #716

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

Merged
merged 2 commits into from
Mar 15, 2019
Merged

[bugfix] Define the set of run environments correctly when -p option is used with regular expressions #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e6cef4
Fix set of run environs when using regex selection
Mar 15, 2019
3ed3d71
Fix unit test failure on Kesch
Mar 15, 2019
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
9 changes: 8 additions & 1 deletion reframe/frontend/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import inspect
import json
import os
import re
import socket
import sys
import traceback
Expand Down Expand Up @@ -452,6 +453,12 @@ def main():

checks_matched = [c for c in checks_matched]

# Determine the programming environments to run with
run_environs = {e.name
for env_patt in options.prgenv
for p in rt.system.partitions
for e in p.environs if re.match(env_patt, e.name)}

# Act on checks

# Unload regression's module and load user-specified modules
Expand Down Expand Up @@ -496,7 +503,7 @@ def main():
exec_policy.skip_environ_check = options.skip_prgenv_check
exec_policy.skip_sanity_check = options.skip_sanity_check
exec_policy.skip_performance_check = options.skip_performance_check
exec_policy.only_environs = options.prgenv
exec_policy.only_environs = run_environs
exec_policy.keep_stage_files = options.keep_stage_files
try:
errmsg = "invalid option for --flex-alloc-tasks: '{0}'"
Expand Down
8 changes: 6 additions & 2 deletions unittests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,16 @@ def test_check_submit_success(self):
self.local = False
self.system = partition.fullname

# pick up the programming environment of the partition
self.environs = [partition.environs[0].name]
# Pick up the programming environment of the partition
# Prepend ^ and append $ so as to much exactly the given name
self.environs = ['^' + partition.environs[0].name + '$']

returncode, stdout, _ = self._run_reframe()
self.assertNotIn('FAILED', stdout)
self.assertIn('PASSED', stdout)

# Assert that we have run only one test case
self.assertIn('Ran 1 test case(s)', stdout)
self.assertEqual(0, returncode)

def test_check_failure(self):
Expand Down