diff options
author | stijn <stijn@ignitron.net> | 2017-01-23 10:44:29 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2017-01-24 00:30:55 +1100 |
commit | 533129f83527aa1e405a3c4010d30e9386b6befa (patch) | |
tree | b02f48e04d397c9d4e8177d090dc26844b909427 | |
parent | c707668d9e84f4b27b9d306f6cf2687e83f4425d (diff) | |
download | micropython-533129f83527aa1e405a3c4010d30e9386b6befa.tar.gz micropython-533129f83527aa1e405a3c4010d30e9386b6befa.zip |
tests: Make sure special tests can be skipped as well.
Fixes #2806.
-rwxr-xr-x | tests/run-tests | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/run-tests b/tests/run-tests index 6834d59bef..16d5f15eaa 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -145,6 +145,10 @@ def run_micropython(pyb, args, test_file): # canonical form for all ports/platforms is to use \n for end-of-line output_mupy = output_mupy.replace(b'\r\n', b'\n') + # don't try to convert the output if we should skip this test + if output_mupy == b'SKIP\n': + return output_mupy + if is_special or test_file in special_tests: # convert parts of the output that are not stable across runs with open(test_file + '.exp', 'rb') as f: |