summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorChris Angelico <rosuav@gmail.com>2014-06-06 07:45:55 +1000
committerChris Angelico <rosuav@gmail.com>2014-06-06 07:51:01 +1000
commit047db2299cf8249a745ab3ff192498ce3657721a (patch)
tree199bda7a3c410b10996f2cf8b2e54207d62238e3
parent88b11b50e5f26432917579a8b2ec0749bbf0c2fa (diff)
downloadmicropython-047db2299cf8249a745ab3ff192498ce3657721a.tar.gz
micropython-047db2299cf8249a745ab3ff192498ce3657721a.zip
Turn the Travis CI test skipping mechanism into something more generic
-rwxr-xr-xtests/run-tests9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/run-tests b/tests/run-tests
index 15c2cbbf5c..866e5a14cc 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -27,16 +27,17 @@ def run_tests(pyb, tests):
failed_tests = []
skipped_tests = []
- running_under_travis = os.getenv('TRAVIS') == 'true'
+ skip_tests = set()
- # Set of tests that we shouldn't run under Travis CI
- skip_travis_tests = set(['basics/memoryerror.py'])
+ # Some tests shouldn't be run under Travis CI
+ if os.getenv('TRAVIS') == 'true':
+ skip_tests.add('basics/memoryerror.py')
for test_file in tests:
test_basename = os.path.basename(test_file)
test_name = os.path.splitext(test_basename)[0]
- if running_under_travis and test_file in skip_travis_tests:
+ if test_file in skip_tests:
print("skip ", test_file)
skipped_tests.append(test_name)
continue