From a2f9c9445af51229becf7410a5c102a2ca27c182 Mon Sep 17 00:00:00 2001 From: stijn Date: Sat, 4 Oct 2014 08:38:07 +0200 Subject: [PATCH 1/2] Enable unicode for Windows port so unicode tests give correct uPy output --- windows/mpconfigport.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/mpconfigport.h b/windows/mpconfigport.h index 9725c3dfe5..9e666e3f32 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" From dc1ea1156a13c03d74433182e34e2a5fdb638f71 Mon Sep 17 00:00:00 2001 From: stijn Date: Sat, 4 Oct 2014 08:39:15 +0200 Subject: [PATCH 2/2] Exclude some tests which always fail on windows --- tests/run-tests | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/run-tests b/tests/run-tests index 20fe1a541a..cc1020e60a 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':