diff options
| author | Damien George | 2014-10-05 17:48:37 +0100 |
|---|---|---|
| committer | Damien George | 2014-10-05 17:48:37 +0100 |
| commit | d112cbfd7cc262860dfe371490fca3eea1c3481b (patch) | |
| tree | 73d209be0435ccc4e2b9dae5021ad7f004ea3354 | |
| parent | 24119176e7ff39e55c8067624d74d17ac1f0ffa3 (diff) | |
| parent | dc1ea1156a13c03d74433182e34e2a5fdb638f71 (diff) | |
Merge pull request #891 from stinos/windows-tests
windows tests fixes
| -rwxr-xr-x | tests/run-tests | 6 | ||||
| -rw-r--r-- | windows/mpconfigport.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/run-tests b/tests/run-tests index 20fe1a541..cc1020e60 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -42,6 +42,12 @@ def run_tests(pyb, tests, args): if pyb is None and platform.architecture()[0] == '64bit': pass + # Some tests use unsupported features on Windows + if os.name == 'nt': + skip_tests.add('extmod\\ujson_loads.py') #works but -2e-3 is printed as -0.002000000000000001 except for mingw-w64 + 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 if args.emit == 'native': diff --git a/windows/mpconfigport.h b/windows/mpconfigport.h index 9725c3dfe..9e666e3f3 100644 --- a/windows/mpconfigport.h +++ b/windows/mpconfigport.h @@ -46,7 +46,7 @@ #define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ) #define MICROPY_STREAMS_NON_BLOCK (1) #define MICROPY_OPT_COMPUTED_GOTO (0) -#define MICROPY_PY_BUILTINS_STR_UNICODE (0) +#define MICROPY_PY_BUILTINS_STR_UNICODE (1) #define MICROPY_PY_BUILTINS_FROZENSET (1) #define MICROPY_PY_SYS_EXIT (1) #define MICROPY_PY_SYS_PLATFORM "win32" |