djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #667 from Rosuav/testfixes 

A couple of small fixes to run-tests
This commit is contained in:
Paul Sokolovsky 2014-06-06 22:23:23 +03:00
parent 8c75bd26e2 047db2299c
commit b56a53dfd6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/run-tests
View File

@ -27,13 +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:
if running_under_travis and test_file in skip_travis_tests:
test_basename = os.path.basename(test_file)
test_name = os.path.splitext(test_basename)[0]
if test_file in skip_tests:
print("skip ", test_file)
skipped_tests.append(test_name)
continue
@ -68,9 +72,6 @@ def run_tests(pyb, tests):
except pyboard.PyboardError:
output_mupy = b'CRASH'
test_basename = os.path.basename(test_file)
test_name = os.path.splitext(test_basename)[0]
if output_mupy == b'SKIP\n':
print("skip ", test_file)
skipped_tests.append(test_name)