From 2836f49eec34b49f16eef936b906f8a68377e9af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zsolt=20Borb=C3=A9ly?= Date: Fri, 5 Aug 2016 12:53:41 +0200 Subject: [PATCH] Fix run-tests.py: don't override the return value of a testrun MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit JerryScript-DCO-1.0-Signed-off-by: Zsolt Borbély zsborbely.u-szeged@partner.samsung.com --- tools/run-tests.py | 64 +++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/tools/run-tests.py b/tools/run-tests.py index 3749a1922..39613dcd3 100755 --- a/tools/run-tests.py +++ b/tools/run-tests.py @@ -112,51 +112,51 @@ def create_binary(buildoptions): return 0 def run_jerry_tests(): + ret_build = ret_test = 0 for job in jerry_tests_options: - ret = create_binary(job.build_args) - - if not ret: - test_cmd = [TEST_RUNNER_SCRIPT, get_binary_path(job.out_dir), JERRY_TESTS_DIR] - if job.test_args: - test_cmd.extend(job.test_args) - - ret = run_check(test_cmd) - else: + ret_build = create_binary(job.build_args) + if ret_build: break - return ret + test_cmd = [TEST_RUNNER_SCRIPT, get_binary_path(job.out_dir), JERRY_TESTS_DIR] + if job.test_args: + test_cmd.extend(job.test_args) + + ret_test |= run_check(test_cmd) + + return ret_build | ret_test def run_jerry_test_suite(): + ret_build = ret_test = 0 for job in jerry_test_suite_options: - ret = create_binary(job.build_args) - - if not ret: - test_cmd = [TEST_RUNNER_SCRIPT, get_binary_path(job.out_dir)] - - if '--profile=minimal' in job.build_args: - test_cmd.append(JERRY_TEST_SUITE_MINIMAL_LIST) - else: - test_cmd.append(JERRY_TEST_SUITE_DIR) - - if job.test_args: - test_cmd.extend(job.test_args) - - ret = run_check(test_cmd) - else: + ret_build = create_binary(job.build_args) + if ret_build: break - return ret + test_cmd = [TEST_RUNNER_SCRIPT, get_binary_path(job.out_dir)] + + if '--profile=minimal' in job.build_args: + test_cmd.append(JERRY_TEST_SUITE_MINIMAL_LIST) + else: + test_cmd.append(JERRY_TEST_SUITE_DIR) + + if job.test_args: + test_cmd.extend(job.test_args) + + ret_test |= run_check(test_cmd) + + return ret_build | ret_test def run_unittests(): + ret_build = ret_test = 0 for job in jerry_unittests_options: - ret = create_binary(job.build_args) - - if not ret: - ret = run_check([UNITTEST_RUNNER_SCRIPT, get_bin_dir_path(job.out_dir)]) - else: + ret_build = create_binary(job.build_args) + if ret_build: break - return ret + ret_test |= run_check([UNITTEST_RUNNER_SCRIPT, get_bin_dir_path(job.out_dir)]) + + return ret_build | ret_test def run_buildoption_test(): for job in jerry_buildoptions: