michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: twister: add quit-on-failure option

Browse source 
in CI, we may need to quit if there is any failure
to save time, so add this --quit-on-failure so that
any failure will quit the test.

Signed-off-by: Hake Huang <hake.huang@oss.nxp.com>
This commit is contained in:
Hake Huang 2024-08-20 01:22:52 +08:00 • committed by Benjamin Cabé
commit 6996436ed6
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/pylib/twister/twisterlib/environment.py
View file

@ -668,6 +668,12 @@ structure in the main Zephyr tree: boards/<vendor>/<board_name>/""")
help="Use the list of test scenarios under quarantine and run them" help="Use the list of test scenarios under quarantine and run them"
"to verify their current status.") "to verify their current status.")
parser.add_argument(
"--quit-on-failure",
action="store_true",
help="""quit twister once there is build / run failure
""")
parser.add_argument( parser.add_argument(
"--report-name", "--report-name",
help="""Create a report with a custom name. help="""Create a report with a custom name.

10
scripts/pylib/twister/twisterlib/runner.py
View file

@ -1927,6 +1927,11 @@ class TwisterRunner:
pb = ProjectBuilder(instance, self.env, self.jobserver) pb = ProjectBuilder(instance, self.env, self.jobserver)
pb.duts = self.duts pb.duts = self.duts
pb.process(pipeline, done_queue, task, lock, results) pb.process(pipeline, done_queue, task, lock, results)
if self.env.options.quit_on_failure and \
pb.instance.status in [TwisterStatus.FAIL, TwisterStatus.ERROR]:
with pipeline.mutex:
pipeline.queue.clear()
break
return True return True
else: else:
@ -1940,6 +1945,11 @@ class TwisterRunner:
pb = ProjectBuilder(instance, self.env, self.jobserver) pb = ProjectBuilder(instance, self.env, self.jobserver)
pb.duts = self.duts pb.duts = self.duts
pb.process(pipeline, done_queue, task, lock, results) pb.process(pipeline, done_queue, task, lock, results)
if self.env.options.quit_on_failure and \
pb.instance.status in [TwisterStatus.FAIL, TwisterStatus.ERROR]:
with pipeline.mutex:
pipeline.queue.clear()
break
return True return True
except Exception as e: except Exception as e:
logger.error(f"General exception: {e}") logger.error(f"General exception: {e}")

6
scripts/pylib/twister/twisterlib/twister_main.py
View file

@ -238,13 +238,17 @@ def main(options: argparse.Namespace, default_options: argparse.Namespace):
artifacts = Artifacts(env) artifacts = Artifacts(env)
artifacts.package() artifacts.package()
logger.info("Run completed")
if ( if (
runner.results.failed runner.results.failed
or runner.results.error or runner.results.error
or (tplan.warnings and options.warnings_as_errors) or (tplan.warnings and options.warnings_as_errors)
or (options.coverage and not coverage_completed) or (options.coverage and not coverage_completed)
): ):
if env.options.quit_on_failure:
logger.info("twister aborted because of a failure/error")
else:
logger.info("Run completed")
return 1 return 1
logger.info("Run completed")
return 0 return 0