From 1f1def54b76a1c103abd117d73f9af2edfb68985 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sun, 28 Nov 2021 15:14:47 -0600 Subject: [PATCH] add aesio to unix coverage build --- .../unix/variants/coverage/mpconfigvariant.mk | 6 +++++- shared-bindings/aesio/aes.c | 8 +++---- tests/unix/extra_coverage.py.exp | 21 ++++++++++--------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk index 563b5ad860..d924fc7146 100644 --- a/ports/unix/variants/coverage/mpconfigvariant.mk +++ b/ports/unix/variants/coverage/mpconfigvariant.mk @@ -31,10 +31,14 @@ SRC_BITMAP := \ $(patsubst ../../%,%,$(wildcard ../../shared-bindings/gifio/*.c ../../shared-module/gifio/*.c)) \ shared/runtime/context_manager_helpers.c \ displayio_min.c \ + shared-bindings/aesio/aes.c \ + shared-bindings/aesio/__init__.c \ shared-bindings/bitmaptools/__init__.c \ shared-bindings/displayio/Bitmap.c \ shared-bindings/rainbowio/__init__.c \ shared-bindings/util.c \ + shared-module/aesio/aes.c \ + shared-module/aesio/__init__.c \ shared-module/bitmaptools/__init__.c \ shared-module/displayio/area.c \ shared-module/displayio/Bitmap.c \ @@ -45,7 +49,7 @@ SRC_BITMAP := \ $(info $(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_CXX += coveragecpp.cpp diff --git a/shared-bindings/aesio/aes.c b/shared-bindings/aesio/aes.c index 152785c584..5737161c32 100644 --- a/shared-bindings/aesio/aes.c +++ b/shared-bindings/aesio/aes.c @@ -41,10 +41,10 @@ STATIC mp_obj_t aesio_aes_make_new(const mp_obj_type_t *type, size_t n_args, (void)type; enum { ARG_key, ARG_mode, ARG_IV, ARG_counter, ARG_segment_size }; static const mp_arg_t allowed_args[] = { - {MP_QSTR_key, MP_ARG_OBJ | MP_ARG_REQUIRED}, - {MP_QSTR_mode, MP_ARG_INT, {.u_int = AES_MODE_ECB}}, - {MP_QSTR_IV, MP_ARG_OBJ}, - {MP_QSTR_counter, MP_ARG_OBJ}, + {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_IV, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + {MP_QSTR_counter, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, {MP_QSTR_segment_size, MP_ARG_INT, {.u_int = 8}}, }; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp index 278c6601a3..54efc744cb 100644 --- a/tests/unix/extra_coverage.py.exp +++ b/tests/unix/extra_coverage.py.exp @@ -29,16 +29,17 @@ RuntimeError: ame__ mport -builtins micropython _thread array -binascii bitmaptools btree cexample -cmath collections cppexample displayio -errno ffi framebuf gc -gifio hashlib json math -qrio rainbowio re sys -termios ubinascii uctypes uerrno -uheapq uio ujson ulab -uos urandom ure uselect -ustruct utime utimeq uzlib +builtins micropython _thread aesio +array binascii bitmaptools btree +cexample cmath collections cppexample +displayio errno ffi framebuf +gc gifio hashlib json +math qrio rainbowio re +sys termios ubinascii uctypes +uerrno uheapq uio ujson +ulab uos urandom ure +uselect ustruct utime utimeq +uzlib ime utime utimeq