From be989be861c05b64425267b62c2419e28e7a8cf1 Mon Sep 17 00:00:00 2001 From: Damien George Date: Tue, 15 Mar 2016 13:45:32 +0000 Subject: [PATCH] qemu-arm: Enable builtin override feature, and enable more tests. Hopefully these tests run reliably on Travis. --- qemu-arm/mpconfigport.h | 1 + tools/tinytest-codegen.py | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/qemu-arm/mpconfigport.h b/qemu-arm/mpconfigport.h index b6e5d48828..ff0e3f99b5 100644 --- a/qemu-arm/mpconfigport.h +++ b/qemu-arm/mpconfigport.h @@ -15,6 +15,7 @@ #define MICROPY_ENABLE_SOURCE_LINE (1) #define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ) #define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_NONE) +#define MICROPY_CAN_OVERRIDE_BUILTINS (1) #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1) #define MICROPY_PY_BUILTINS_FROZENSET (1) #define MICROPY_PY_BUILTINS_MEMORYVIEW (1) diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py index e97659f35b..091c1b065f 100755 --- a/tools/tinytest-codegen.py +++ b/tools/tinytest-codegen.py @@ -46,10 +46,8 @@ testgroup_member = ( ## XXX: may be we could have `--without ` argument... # currently these tests are selected because they pass on qemu-arm -# basics/try_finally1.py passes on local machine but only passes 50% of the -# time on Travis CI; no idea why so we just disable it. test_dirs = ('basics', 'micropython', 'inlineasm') # 'float', 'import', 'io', 'misc') -exclude_tests = ('basics/builtin_override.py', 'basics/class_super_object.py', 'basics/memoryerror.py', 'basics/try_finally1.py', 'micropython/heapalloc.py', 'inlineasm/asmfpaddsub.py', 'inlineasm/asmfpcmp.py', 'inlineasm/asmfpldrstr.py', 'inlineasm/asmfpmuldiv.py', 'inlineasm/asmfpsqrt.py',) +exclude_tests = ('inlineasm/asmfpaddsub.py', 'inlineasm/asmfpcmp.py', 'inlineasm/asmfpldrstr.py', 'inlineasm/asmfpmuldiv.py', 'inlineasm/asmfpsqrt.py',) output = []