diff options
| author | stijn <stinos@zoho.com> | 2014-12-18 16:53:46 +0100 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-12-20 16:52:22 +0200 |
| commit | f5efefd5a0ba48b4aa980fc21b8371ab6473fb69 (patch) | |
| tree | 2be97fd89a71ba11638bbdaf073db0c67089e8b8 | |
| parent | 6d3ae569cf7115ff3453d89cd37166edea41de24 (diff) | |
| download | micropython-f5efefd5a0ba48b4aa980fc21b8371ab6473fb69.tar.gz micropython-f5efefd5a0ba48b4aa980fc21b8371ab6473fb69.zip | |
windows: Correctly interpret skipped tests, enable uhashlib and ubinascii
| -rwxr-xr-x | tests/run-tests | 3 | ||||
| -rw-r--r-- | windows/mpconfigport.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/run-tests b/tests/run-tests index d8774d827b..9abcd1138f 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -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 diff --git a/windows/mpconfigport.h b/windows/mpconfigport.h index 1ec0c41aff..d4d66109de 100644 --- a/windows/mpconfigport.h +++ b/windows/mpconfigport.h @@ -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 |