From 138562ccd975dbccd189c1221349ca2fc1e0fda9 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 13 Dec 2014 00:50:54 +0200 Subject: [PATCH] run-tests: Skip native/viper tests based on prefix. Otherwise, new tests are forgotten to be added to explicit lists. Issue found running on Debian/ARM. --- tests/run-tests | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/run-tests b/tests/run-tests index b31758316b..d8774d827b 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -51,12 +51,12 @@ def run_tests(pyb, tests, args): skipped_tests = [] skip_tests = set() + skip_native = False # Check if micropython.native is supported, and skip such tests if it's not native = run_micropython(pyb, args, 'micropython/native_check.py') if native == b'CRASH': - skip_tests.update({'micropython/native_%s.py' % t for t in 'check misc'.split()}) - skip_tests.update({'micropython/viper_%s.py' % t for t in 'binop_arith binop_comp cond ptr16_store ptr8_store misc'.split()}) + skip_native = True # Some tests shouldn't be run under Travis CI if os.getenv('TRAVIS') == 'true': @@ -91,8 +91,9 @@ def run_tests(pyb, tests, args): for test_file in tests: test_basename = os.path.basename(test_file) test_name = os.path.splitext(test_basename)[0] + is_native = test_name.startswith("native_") or test_name.startswith("viper_") - if test_file in skip_tests: + if test_file in skip_tests or (skip_native and is_native): print("skip ", test_file) skipped_tests.append(test_name) continue