Fix run-tests.py: don't override the return value of a testrun
JerryScript-DCO-1.0-Signed-off-by: Zsolt Borbély zsborbely.u-szeged@partner.samsung.com
This commit is contained in:
+32
-32
@@ -112,51 +112,51 @@ def create_binary(buildoptions):
|
|||||||
return 0
|
return 0
|
||||||
|
|
||||||
def run_jerry_tests():
|
def run_jerry_tests():
|
||||||
|
ret_build = ret_test = 0
|
||||||
for job in jerry_tests_options:
|
for job in jerry_tests_options:
|
||||||
ret = create_binary(job.build_args)
|
ret_build = create_binary(job.build_args)
|
||||||
|
if ret_build:
|
||||||
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:
|
|
||||||
break
|
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():
|
def run_jerry_test_suite():
|
||||||
|
ret_build = ret_test = 0
|
||||||
for job in jerry_test_suite_options:
|
for job in jerry_test_suite_options:
|
||||||
ret = create_binary(job.build_args)
|
ret_build = create_binary(job.build_args)
|
||||||
|
if ret_build:
|
||||||
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:
|
|
||||||
break
|
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():
|
def run_unittests():
|
||||||
|
ret_build = ret_test = 0
|
||||||
for job in jerry_unittests_options:
|
for job in jerry_unittests_options:
|
||||||
ret = create_binary(job.build_args)
|
ret_build = create_binary(job.build_args)
|
||||||
|
if ret_build:
|
||||||
if not ret:
|
|
||||||
ret = run_check([UNITTEST_RUNNER_SCRIPT, get_bin_dir_path(job.out_dir)])
|
|
||||||
else:
|
|
||||||
break
|
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():
|
def run_buildoption_test():
|
||||||
for job in jerry_buildoptions:
|
for job in jerry_buildoptions:
|
||||||
|
|||||||
Reference in New Issue
Block a user