michaelh/zephyr
1
0
Fork 0
Code Releases Activity

twister: add option cleanup all tests

Browse source 
add 2 choices for '--runtime-artifact-cleanup' option,
'passing' to delete artifacts of passing tests,
'all' to delete artifacts of both passing tests
and failing tests

keep testcase_extra.config, it contains some extra Kconfig
needed for the tests and they is only generated first time
when run retry failed

Signed-off-by: Cong Nguyen Huu <cong.nguyenhuu@nxp.com>
This commit is contained in:
Cong Nguyen Huu 2022-07-13 13:23:18 +07:00 • committed by Anas Nashif
commit c304db56f1
2 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@
# vim: set syntax=python ts=4 : # vim: set syntax=python ts=4 :
# #
# Copyright (c) 2018 Intel Corporation # Copyright (c) 2018 Intel Corporation
# Copyright 2022 NXP
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
import os import os
@ -378,8 +379,11 @@ structure in the main Zephyr tree: boards/<arch>/<board_name>/""")
help="Specify a file where to save logs.") help="Specify a file where to save logs.")
parser.add_argument( parser.add_argument(
"-M", "--runtime-artifact-cleanup", action="store_true", "-M", "--runtime-artifact-cleanup", choices=['pass', 'all'],
help="Delete artifacts of passing tests.") default=None, const='pass', nargs='?',
help="""Cleanup test artifacts. The default behavior is 'pass'
which only removes artifacts of passing tests. If you wish to
remove all artificats including those of failed tests, use 'all'.""")
test_xor_generator.add_argument( test_xor_generator.add_argument(
"-N", "--ninja", action="store_true", "-N", "--ninja", action="store_true",

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

@ -1,6 +1,7 @@
# vim: set syntax=python ts=4 : # vim: set syntax=python ts=4 :
# #
# Copyright (c) 20180-2022 Intel Corporation # Copyright (c) 20180-2022 Intel Corporation
# Copyright 2022 NXP
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
import os import os
@ -575,17 +576,22 @@ class ProjectBuilder(FilterBuilder):
done.put(self.instance) done.put(self.instance)
self.report_out(results) self.report_out(results)
if self.options.runtime_artifact_cleanup and not self.options.coverage and self.instance.status == "passed": if not self.options.coverage:
pipeline.put({ if self.options.runtime_artifact_cleanup == "pass" and self.instance.status == "passed":
"op": "cleanup", pipeline.put({"op": "cleanup_pass", "test": self.instance})
"test": self.instance if self.options.runtime_artifact_cleanup == "all":
}) pipeline.put({"op": "cleanup_all", "test": self.instance})
elif op == "cleanup": elif op == "cleanup_pass":
if self.options.device_testing or self.options.prep_artifacts_for_testing: if self.options.device_testing or self.options.prep_artifacts_for_testing:
self.cleanup_device_testing_artifacts() self.cleanup_device_testing_artifacts()
else: else:
self.cleanup_artifacts() self.cleanup_artifacts()
elif op == "cleanup_all":
if (self.options.device_testing or self.options.prep_artifacts_for_testing) and self.instance.reason != "Cmake build failure":
self.cleanup_device_testing_artifacts()
else:
self.cleanup_artifacts()
def determine_testcases(self, results): def determine_testcases(self, results):
symbol_file = os.path.join(self.build_dir, "zephyr", "zephyr.symbols") symbol_file = os.path.join(self.build_dir, "zephyr", "zephyr.symbols")
@ -627,7 +633,7 @@ class ProjectBuilder(FilterBuilder):
def cleanup_artifacts(self, additional_keep=[]): def cleanup_artifacts(self, additional_keep=[]):
logger.debug("Cleaning up {}".format(self.instance.build_dir)) logger.debug("Cleaning up {}".format(self.instance.build_dir))
allow = [ allow = [
'zephyr/.config', os.path.join('zephyr', '.config'),
'handler.log', 'handler.log',
'build.log', 'build.log',
'device.log', 'device.log',
@ -636,11 +642,14 @@ class ProjectBuilder(FilterBuilder):
'Makefile', 'Makefile',
'CMakeCache.txt', 'CMakeCache.txt',
'build.ninja', 'build.ninja',
'CMakeFiles/rules.ninja' os.path.join('CMakeFiles', 'rules.ninja')
] ]
allow += additional_keep allow += additional_keep
if self.options.runtime_artifact_cleanup == 'all':
allow += [os.path.join('twister', 'testsuite_extra.conf')]
allow = [os.path.join(self.instance.build_dir, file) for file in allow] allow = [os.path.join(self.instance.build_dir, file) for file in allow]
for dirpath, dirnames, filenames in os.walk(self.instance.build_dir, topdown=False): for dirpath, dirnames, filenames in os.walk(self.instance.build_dir, topdown=False):
@ -661,12 +670,12 @@ class ProjectBuilder(FilterBuilder):
sanitizelist = [ sanitizelist = [
'CMakeCache.txt', 'CMakeCache.txt',
'zephyr/runners.yaml', os.path.join('zephyr', 'runners.yaml'),
] ]
keep = [ keep = [
'zephyr/zephyr.hex', os.path.join('zephyr', 'zephyr.hex'),
'zephyr/zephyr.bin', os.path.join('zephyr', 'zephyr.bin'),
'zephyr/zephyr.elf', os.path.join('zephyr', 'zephyr.elf'),
] ]
keep += sanitizelist keep += sanitizelist