diff options
| author | Dan Halbert <halbert@halwitz.org> | 2018-07-28 13:29:47 -0400 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2018-07-28 13:29:47 -0400 |
| commit | f48b70050e3e4122eaae3eee47d35fc30bda2a4c (patch) | |
| tree | 7d2dacc3c137276e9d0838b571c84c09e78acc42 /tests | |
| parent | bc760dd34100099c352a0f185ec54ceae23d036d (diff) | |
merge finished
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/import/mpy_invalid.py.exp | 6 | ||||
| -rwxr-xr-x | tests/run-tests | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/import/mpy_invalid.py.exp b/tests/import/mpy_invalid.py.exp index 1727ea1ce..e4f2b13e9 100644 --- a/tests/import/mpy_invalid.py.exp +++ b/tests/import/mpy_invalid.py.exp @@ -1,3 +1,3 @@ -mod0 ValueError incompatible .mpy file -mod1 ValueError incompatible .mpy file -mod2 ValueError incompatible .mpy file +mod0 ValueError Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/mpy-update for more info. +mod1 ValueError Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/mpy-update for more info. +mod2 ValueError Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/mpy-update for more info. diff --git a/tests/run-tests b/tests/run-tests index 3064f6845..94e1591e8 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -396,7 +396,7 @@ def run_tests(pyb, tests, args, base_path=".", num_threads=1): if pat.search(test_file): verdict = action if verdict == "exclude": - continue + return test_basename = os.path.basename(test_file) test_name = os.path.splitext(test_basename)[0] @@ -419,7 +419,7 @@ def run_tests(pyb, tests, args, base_path=".", num_threads=1): if args.list_tests: if not skip_it: print(test_file) - continue + return if skip_it: print("skip ", test_file) |