Skip to content

Commit

Permalink
remove test / include combo
Browse files Browse the repository at this point in the history
  • Loading branch information
mkorpela committed Jan 28, 2024
1 parent e539083 commit 3217df5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/pabot/pabot.py
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,6 @@ def _options_for_executor(
options["xunit"] = "NONE"
options["test"] = options.get("test", [])[:]
options["suite"] = options.get("suite", [])[:]
if (options["test"] or options["suite"]) and "include" in options:
del options["include"]
execution_item.modify_options_for_executor(options)
options["outputdir"] = "%OUTPUTDIR%" if execution_item.type == "hived" else outs_dir
options["variable"] = options.get("variable", [])[:]
Expand Down Expand Up @@ -638,6 +636,8 @@ def _options_for_executor(
if argfile:
_modify_options_for_argfile_use(argfile, options, execution_item.top_name())
options["argumentfile"] = argfile
if options.get("test", False) and options.get("include", []):
del options["include"]
return _set_terminal_coloring_options(options)


Expand Down

0 comments on commit 3217df5

Please sign in to comment.