summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorstijn <stijn@ignitron.net>2016-10-05 12:34:18 +0200
committerstijn <stijn@ignitron.net>2016-10-05 12:58:50 +0200
commit7f19b1c3eb488a8466fd1fca0530dba6a02d9f1a (patch)
treeaaf7fdd6c3a16a5d4a53d13a3232193e8c3910c2
parentb89ac9db78def244fca8a38636709a14ff39dcd9 (diff)
downloadmicropython-7f19b1c3eb488a8466fd1fca0530dba6a02d9f1a.tar.gz
micropython-7f19b1c3eb488a8466fd1fca0530dba6a02d9f1a.zip
tests: Fix expected output of verbose cmdline test
The output might contain more than one line ending in 5b so properly skip everything until the next known point. This fixes test failures in appveyor debug builds.
-rw-r--r--tests/cmdline/cmd_showbc.py.exp3
-rwxr-xr-xtests/run-tests1
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/cmdline/cmd_showbc.py.exp b/tests/cmdline/cmd_showbc.py.exp
index d3ac8d1c28..0e5c559424 100644
--- a/tests/cmdline/cmd_showbc.py.exp
+++ b/tests/cmdline/cmd_showbc.py.exp
@@ -27,8 +27,7 @@ arg names:
File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ bytes)
Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
########
-\.\+5b
-arg names:
+\.\+rg names:
(N_STATE 22)
(N_EXC_STACK 2)
(INIT_CELL 14)
diff --git a/tests/run-tests b/tests/run-tests
index 4a28894978..cb920c0946 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -267,7 +267,6 @@ def run_tests(pyb, tests, args):
# Some tests use unsupported features on Windows
if os.name == 'nt':
skip_tests.add('import/import_file.py') # works but CPython prints forward slashes
- skip_tests.add('cmdline/cmd_showbc.py') # fails on AppVeyor x86 builds
# Some tests are known to fail with native emitter
# Remove them from the below when they work