test: use ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS by all tests

This commit is contained in:
Matthias Ringwald 2021-01-29 20:54:04 +01:00
parent 7a65bea8ef
commit e2c00bfeb6
4 changed files with 25 additions and 13 deletions

View File

@ -4,14 +4,16 @@ CC = g++
BTSTACK_ROOT = ../..
CFLAGS = -DUNIT_TEST -x c++ -g -Wall -Wnarrowing -Wconversion-null -I. -I../
CFLAGS = -DUNIT_TEST -g -Wall -Wnarrowing -Wconversion-null -I. -I../
CFLAGS += -I${BTSTACK_ROOT}/src
CFLAGS += -I${BTSTACK_ROOT}/3rd-party/rijndael
CFLAGS += -I${BTSTACK_ROOT}/3rd-party/micro-ecc
VPATH += ${BTSTACK_ROOT}/src
VPATH += ${BTSTACK_ROOT}/src/ble
VPATH += ${BTSTACK_ROOT}/src/ble/gatt-service
VPATH += ${BTSTACK_ROOT}/platform/posix
VPATH += ${BTSTACK_ROOT}/3rd-party/micro-ecc
VPATH += ${BTSTACK_ROOT}/3rd-party/rijndael
COMMON = \
@ -47,8 +49,8 @@ LDFLAGS += -lCppUTest -lCppUTestExt
LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage
LDFLAGS_ASAN = ${LDFLAGS} -fsanitize=address
COMMON_OBJ_COVERAGE = $(addprefix build-coverage/,$(COMMON:.c=.o))
COMMON_OBJ_ASAN = $(addprefix build-asan/, $(COMMON:.c=.o))
COMMON_OBJ_COVERAGE = $(addprefix build-coverage/,$(COMMON:.c=.o)) build-coverage/uECC.c.o
COMMON_OBJ_ASAN = $(addprefix build-asan/, $(COMMON:.c=.o)) build-asan/uECC.c.o
all: build-coverage/gatt_server_test build-asan/gatt_server_test
@ -63,9 +65,16 @@ build-%/profile.h: profile.gatt | build-%
build-coverage/%.o: %.c | build-coverage
${CC} -c $(CFLAGS_COVERAGE) $< -o $@
build-coverage/%.c.o: %.c | build-coverage
gcc -c $(CFLAGS_COVERAGE) $< -o $@
build-asan/%.o: %.c | build-asan
${CC} -c $(CFLAGS_ASAN) $< -o $@
build-asan/%.c.o: %.c | build-asan
gcc -c $(CFLAGS_ASAN) $< -o $@
build-coverage/gatt_server_test: ${COMMON_OBJ_COVERAGE} build-coverage/profile.h build-coverage/gatt_server_test.o | build-coverage
${CC} $(filter-out build-coverage/profile.h,$^) ${LDFLAGS_COVERAGE} -o $@

View File

@ -16,6 +16,7 @@
#define ENABLE_ATT_DELAYED_RESPONSE
#define ENABLE_BLE
#define ENABLE_CLASSIC
#define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS
#define ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE
#define ENABLE_LE_CENTRAL
#define ENABLE_LE_PERIPHERAL
@ -26,7 +27,6 @@
#define ENABLE_PRINTF_HEXDUMP
#define ENABLE_SDP_DES_DUMP
#define ENABLE_SDP_EXTRA_QUERIES
#define ENABLE_SDP_EXTRA_QUERIES
#define ENABLE_SOFTWARE_AES128
// BTstack configuration. buffers, sizes, ...

View File

@ -5,7 +5,7 @@ CC = g++
BTSTACK_ROOT = ../..
CFLAGS = -DUNIT_TEST -g
CFLAGS += -x c++ -Wall -Wno-unused
CFLAGS += -Wall -Wno-unused
CFLAGS += -I. -I.. -I${BTSTACK_ROOT}/src
CFLAGS += -I${BTSTACK_ROOT}/platform/embedded
CFLAGS += -I${BTSTACK_ROOT}/3rd-party/mbedtls/include
@ -43,11 +43,8 @@ LDFLAGS += -lCppUTest -lCppUTestExt
LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage
LDFLAGS_ASAN = ${LDFLAGS} -fsanitize=address
COMMON_OBJ_COVERAGE = $(addprefix build-coverage/,$(COMMON:.c=.o))
COMMON_OBJ_ASAN = $(addprefix build-asan/, $(COMMON:.c=.o))
CORE_OBJ_COVERAGE = $(addprefix build-coverage/,$(CORE:.c=.o))
CORE_OBJ_ASAN = $(addprefix build-asan/, $(CORE:.c=.o))
COMMON_OBJ_COVERAGE = $(addprefix build-coverage/,$(COMMON:.c=.o)) build-coverage/uECC.c.o
COMMON_OBJ_ASAN = $(addprefix build-asan/, $(COMMON:.c=.o)) build-asan/uECC.c.o
all: build-coverage/security_manager build-asan/security_manager
@ -57,14 +54,20 @@ build-%:
build-coverage/%.o: %.c | build-coverage
${CC} -c $(CFLAGS_COVERAGE) $< -o $@
build-coverage/%.c.o: %.c | build-coverage
gcc -c $(CFLAGS_COVERAGE) $< -o $@
build-asan/%.o: %.c | build-asan
${CC} -c $(CFLAGS_ASAN) $< -o $@
build-asan/%.c.o: %.c | build-asan
gcc -c $(CFLAGS_ASAN) $< -o $@
build-coverage/security_manager: ${CORE_OBJ_COVERAGE} ${COMMON_OBJ_COVERAGE} build-coverage/security_manager.o | build-coverage
build-coverage/security_manager: ${COMMON_OBJ_COVERAGE} build-coverage/security_manager.o | build-coverage
${CC} $^ ${LDFLAGS_COVERAGE} -o $@
build-asan/security_manager: ${CORE_OBJ_ASAN} ${COMMON_OBJ_ASAN} build-asan/security_manager.o | build-asan
build-asan/security_manager: ${COMMON_OBJ_ASAN} build-asan/security_manager.o | build-asan
${CC} $^ ${LDFLAGS_ASAN} -o $@

View File

@ -17,7 +17,7 @@
#define ENABLE_LOG_INFO
#define ENABLE_PRINTF_HEXDUMP
//#define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS
#define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS
#define ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE
#define ENABLE_LE_CENTRAL
#define ENABLE_LE_PERIPHERAL