diff options
| author | Tony DiCola <tony@tonydicola.com> | 2016-10-20 23:01:13 +0000 |
|---|---|---|
| committer | Tony DiCola <tony@tonydicola.com> | 2016-10-20 23:01:13 +0000 |
| commit | 00a44fa36cd1e35a438c4b89b5cef0bc82787c7a (patch) | |
| tree | 4800a6984902e043e3fc437adcdfcd665f83e220 /tools | |
| parent | 1f13f870b8f6554d9cd5570de221a6886e065b64 (diff) | |
| parent | 3967ca7390ff8257728ef6237b93977b63bde41d (diff) | |
Merge remote-tracking branch 'micropython/master'
Conflicts:
README.md - Kept Adafruit README.md intact.
py/emitglue.c - Added xtensa architecture as an OR of the define.
zephyr/README.md - Fixed spelling mistake.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/micropython-upip-1.0.tar.gz | bin | 4075 -> 0 bytes | |||
| -rw-r--r-- | tools/micropython-upip-1.1.3.tar.gz | bin | 0 -> 4072 bytes | |||
| -rwxr-xr-x | tools/tinytest-codegen.py | 11 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tools/micropython-upip-1.0.tar.gz b/tools/micropython-upip-1.0.tar.gz Binary files differdeleted file mode 100644 index f34915070..000000000 --- a/tools/micropython-upip-1.0.tar.gz +++ /dev/null diff --git a/tools/micropython-upip-1.1.3.tar.gz b/tools/micropython-upip-1.1.3.tar.gz Binary files differnew file mode 100644 index 000000000..90f726d86 --- /dev/null +++ b/tools/micropython-upip-1.1.3.tar.gz diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py index 091c1b065..bab937135 100755 --- a/tools/tinytest-codegen.py +++ b/tools/tinytest-codegen.py @@ -46,8 +46,15 @@ testgroup_member = ( ## XXX: may be we could have `--without <groups>` argument... # currently these tests are selected because they pass on qemu-arm -test_dirs = ('basics', 'micropython', 'inlineasm') # 'float', 'import', 'io', 'misc') -exclude_tests = ('inlineasm/asmfpaddsub.py', 'inlineasm/asmfpcmp.py', 'inlineasm/asmfpldrstr.py', 'inlineasm/asmfpmuldiv.py', 'inlineasm/asmfpsqrt.py',) +test_dirs = ('basics', 'micropython', 'extmod', 'inlineasm') # 'float', 'import', 'io', 'misc') +exclude_tests = ( + 'inlineasm/asmfpaddsub.py', 'inlineasm/asmfpcmp.py', 'inlineasm/asmfpldrstr.py', 'inlineasm/asmfpmuldiv.py', 'inlineasm/asmfpsqrt.py', + 'extmod/time_ms_us.py', + 'extmod/ujson_dumps_float.py', 'extmod/ujson_loads_float.py', + 'extmod/uctypes_native_float.py', 'extmod/uctypes_le_float.py', + 'extmod/machine_pinbase.py', 'extmod/machine_pulse.py', + 'extmod/vfs_fat_ramdisk.py', +) output = [] |