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

windows: Correctly interpret skipped tests, enable uhashlib and ubinascii

Browse Source
This commit is contained in:
stijn 2014-12-18 16:53:46 +01:00 committed by Paul Sokolovsky
parent 6d3ae569cf
commit f5efefd5a0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/run-tests
View File

@ -73,7 +73,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('unix\\ffi_float.py')
# Some tests are known to fail with native emitter
# Remove them from the below when they work
@ -122,7 +121,7 @@ def run_tests(pyb, tests, args):
# run Micro Python
output_mupy = run_micropython(pyb, args, test_file)
if output_mupy == b'SKIP\n':
if output_mupy == b'SKIP\n' or output_mupy == b'SKIP\r\n':
print("skip ", test_file)
skipped_tests.append(test_name)
continue

2
windows/mpconfigport.h
View File

@ -64,6 +64,8 @@
#define MICROPY_PY_UJSON (1)
#define MICROPY_PY_URE (1)
#define MICROPY_PY_UHEAPQ (1)
#define MICROPY_PY_UHASHLIB (1)
#define MICROPY_PY_UBINASCII (1)
#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_DETAILED)
#ifdef _MSC_VER