提交 1fdc6f4f 编写于 作者: A Alexander Pantyukhin 提交者: Shuah Khan

tools/testing/kunit/kunit.py: remove redundant double check

The build_tests function contained double checking for not success
result. It is fixed in the current patch. Additional small
simplifications of code like using ternary if were applied (avoid using
the same operation by calculation times differ in two places).
Signed-off-by: NAlexander Pantyukhin <apantykhin@gmail.com>
Reviewed-by: NDavid Gow <davidgow@google.com>
Signed-off-by: NShuah Khan <skhan@linuxfoundation.org>
上级 4ec5183e
...@@ -77,11 +77,8 @@ def config_tests(linux: kunit_kernel.LinuxSourceTree, ...@@ -77,11 +77,8 @@ def config_tests(linux: kunit_kernel.LinuxSourceTree,
config_start = time.time() config_start = time.time()
success = linux.build_reconfig(request.build_dir, request.make_options) success = linux.build_reconfig(request.build_dir, request.make_options)
config_end = time.time() config_end = time.time()
if not success: status = KunitStatus.SUCCESS if success else KunitStatus.CONFIG_FAILURE
return KunitResult(KunitStatus.CONFIG_FAILURE, return KunitResult(status, config_end - config_start)
config_end - config_start)
return KunitResult(KunitStatus.SUCCESS,
config_end - config_start)
def build_tests(linux: kunit_kernel.LinuxSourceTree, def build_tests(linux: kunit_kernel.LinuxSourceTree,
request: KunitBuildRequest) -> KunitResult: request: KunitBuildRequest) -> KunitResult:
...@@ -92,14 +89,8 @@ def build_tests(linux: kunit_kernel.LinuxSourceTree, ...@@ -92,14 +89,8 @@ def build_tests(linux: kunit_kernel.LinuxSourceTree,
request.build_dir, request.build_dir,
request.make_options) request.make_options)
build_end = time.time() build_end = time.time()
if not success: status = KunitStatus.SUCCESS if success else KunitStatus.BUILD_FAILURE
return KunitResult(KunitStatus.BUILD_FAILURE, return KunitResult(status, build_end - build_start)
build_end - build_start)
if not success:
return KunitResult(KunitStatus.BUILD_FAILURE,
build_end - build_start)
return KunitResult(KunitStatus.SUCCESS,
build_end - build_start)
def config_and_build_tests(linux: kunit_kernel.LinuxSourceTree, def config_and_build_tests(linux: kunit_kernel.LinuxSourceTree,
request: KunitBuildRequest) -> KunitResult: request: KunitBuildRequest) -> KunitResult:
...@@ -145,7 +136,7 @@ def exec_tests(linux: kunit_kernel.LinuxSourceTree, request: KunitExecRequest) - ...@@ -145,7 +136,7 @@ def exec_tests(linux: kunit_kernel.LinuxSourceTree, request: KunitExecRequest) -
tests = _list_tests(linux, request) tests = _list_tests(linux, request)
if request.run_isolated == 'test': if request.run_isolated == 'test':
filter_globs = tests filter_globs = tests
if request.run_isolated == 'suite': elif request.run_isolated == 'suite':
filter_globs = _suites_from_test_list(tests) filter_globs = _suites_from_test_list(tests)
# Apply the test-part of the user's glob, if present. # Apply the test-part of the user's glob, if present.
if '.' in request.filter_glob: if '.' in request.filter_glob:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册