Skip to content
Merged
Changes from all commits
Commits
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
55 changes: 38 additions & 17 deletions lib/pavilion/commands/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from pavilion import cmd_utils
from pavilion import groups
from pavilion import output
from pavilion import resolver
from pavilion.enums import Verbose
from pavilion.errors import TestSeriesError, PavilionError
from pavilion.series.series import TestSeries
Expand Down Expand Up @@ -61,6 +62,10 @@ def _generic_arguments(parser):
:param argparse.ArgumentParser parser:
"""

parser.add_argument(
"-a", "--all", action="store_true",
help="Build or run all known tests."
)
parser.add_argument(
'-p', '--platform', action='store',
help='The platform to configure this test for. If not '
Expand Down Expand Up @@ -152,13 +157,19 @@ def run(self, pav_cfg, args, log_results: bool = True):
ignore_errors=args.ignore_errors,
)

tests = args.tests
try:
tests.extend(cmd_utils.read_test_files(pav_cfg, args.files))
except PavilionError as err:
output.fprint(self.errfile, "Error reading given test list files.\n{}"
.format(err))
return errno.EINVAL
if args.all:
resolv = resolver.TestConfigResolver(pav_cfg)
suites = resolv.find_all_tests()
tests = list(suites.keys())
args.files = []
else:
tests = args.tests
try:
tests.extend(cmd_utils.read_test_files(pav_cfg, args.files))
except PavilionError as err:
output.fprint(self.errfile, "Error reading given test list files.\n{}"
.format(err))
return errno.EINVAL

local_builds_only = getattr(args, 'local_builds_only', False)
report_status = getattr(args, 'status', False)
Expand All @@ -167,18 +178,13 @@ def run(self, pav_cfg, args, log_results: bool = True):
series_obj = TestSeries(pav_cfg, series_cfg=series_cfg,
verbosity=Verbose[args.verbosity],
outfile=self.outfile)
testset_name = cmd_utils.get_testset_name(pav_cfg, args.tests, args.files)
testset_name = cmd_utils.get_testset_name(pav_cfg, tests, args.files)

if args.group:
try:
group = groups.TestGroup(pav_cfg, args.group)
group.add([series_obj])
except groups.TestGroupError as err:
output.fprint(self.errfile,
"Could not add series to group '{}'".format(args.group),
color=output.RED)
output.fprint(self.errfile, err.pformat())
return errno.EINVAL
ret = self._add_to_group(pav_cfg, series_obj, args.group)

if ret != 0:
return ret

else:
output.fprint(self.outfile, "Created Test Series {}.".format(series_obj.name))
Expand Down Expand Up @@ -211,3 +217,18 @@ def run(self, pav_cfg, args, log_results: bool = True):
)

return 0

def _add_to_group(self, pav_cfg: "PavConfig", series: "TestSeries", group: str) -> int:
"""Add the given series to the given group."""

try:
group = groups.TestGroup(pav_cfg, group)
group.add([series])

return 0
except groups.TestGroupError as err:
output.fprint(self.errfile,
"Could not add series to group '{}'".format(group),
color=output.RED)
output.fprint(self.errfile, err.pformat())
return errno.EINVAL