djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add aesio to unix coverage build

Browse Source
This commit is contained in:
Jeff Epler 2021-11-28 15:14:47 -06:00
parent 27e8a16bfd
commit 1f1def54b7
No known key found for this signature in database
GPG Key ID: D5BF15AB975AB4DE
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/unix/variants/coverage/mpconfigvariant.mk
View File

@ -31,10 +31,14 @@ SRC_BITMAP := \
$(patsubst ../../%,%,$(wildcard ../../shared-bindings/gifio/*.c ../../shared-module/gifio/*.c)) \ $(patsubst ../../%,%,$(wildcard ../../shared-bindings/gifio/*.c ../../shared-module/gifio/*.c)) \
shared/runtime/context_manager_helpers.c \ shared/runtime/context_manager_helpers.c \
displayio_min.c \ displayio_min.c \
shared-bindings/aesio/aes.c \
shared-bindings/aesio/__init__.c \
shared-bindings/bitmaptools/__init__.c \ shared-bindings/bitmaptools/__init__.c \
shared-bindings/displayio/Bitmap.c \ shared-bindings/displayio/Bitmap.c \
shared-bindings/rainbowio/__init__.c \ shared-bindings/rainbowio/__init__.c \
shared-bindings/util.c \ shared-bindings/util.c \
shared-module/aesio/aes.c \
shared-module/aesio/__init__.c \
shared-module/bitmaptools/__init__.c \ shared-module/bitmaptools/__init__.c \
shared-module/displayio/area.c \ shared-module/displayio/area.c \
shared-module/displayio/Bitmap.c \ shared-module/displayio/Bitmap.c \
@ -45,7 +49,7 @@ SRC_BITMAP := \
$(info $(SRC_BITMAP)) $(info $(SRC_BITMAP))
SRC_C += $(SRC_BITMAP) SRC_C += $(SRC_BITMAP)
CFLAGS += -DCIRCUITPY_GIFIO=1 -DCIRCUITPY_DISPLAYIO_UNIX=1 -DCIRCUITPY_BITMAPTOOLS=1 -DCIRCUITPY_RAINBOWIO=1 CFLAGS += -DCIRCUITPY_GIFIO=1 -DCIRCUITPY_DISPLAYIO_UNIX=1 -DCIRCUITPY_BITMAPTOOLS=1 -DCIRCUITPY_RAINBOWIO=1 -DCIRCUITPY_AESIO=1
SRC_C += coverage.c SRC_C += coverage.c
SRC_CXX += coveragecpp.cpp SRC_CXX += coveragecpp.cpp

6
shared-bindings/aesio/aes.c
View File

@ -41,10 +41,10 @@ STATIC mp_obj_t aesio_aes_make_new(const mp_obj_type_t *type, size_t n_args,
(void)type; (void)type;
enum { ARG_key, ARG_mode, ARG_IV, ARG_counter, ARG_segment_size }; enum { ARG_key, ARG_mode, ARG_IV, ARG_counter, ARG_segment_size };
static const mp_arg_t allowed_args[] = { static const mp_arg_t allowed_args[] = {
{MP_QSTR_key, MP_ARG_OBJ | MP_ARG_REQUIRED}, {MP_QSTR_key, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} },
{MP_QSTR_mode, MP_ARG_INT, {.u_int = AES_MODE_ECB} }, {MP_QSTR_mode, MP_ARG_INT, {.u_int = AES_MODE_ECB} },
{MP_QSTR_IV, MP_ARG_OBJ}, {MP_QSTR_IV, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
{MP_QSTR_counter, MP_ARG_OBJ}, {MP_QSTR_counter, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
{MP_QSTR_segment_size, MP_ARG_INT, {.u_int = 8}}, {MP_QSTR_segment_size, MP_ARG_INT, {.u_int = 8}},
}; };
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];

21
tests/unix/extra_coverage.py.exp
View File

@ -29,16 +29,17 @@ RuntimeError:
ame__ ame__
mport mport
builtins micropython _thread array builtins micropython _thread aesio
binascii bitmaptools btree cexample array binascii bitmaptools btree
cmath collections cppexample displayio cexample cmath collections cppexample
errno ffi framebuf gc displayio errno ffi framebuf
gifio hashlib json math gc gifio hashlib json
qrio rainbowio re sys math qrio rainbowio re
termios ubinascii uctypes uerrno sys termios ubinascii uctypes
uheapq uio ujson ulab uerrno uheapq uio ujson
uos urandom ure uselect ulab uos urandom ure
ustruct utime utimeq uzlib uselect ustruct utime utimeq
uzlib
ime ime
utime utimeq utime utimeq