From 71d52576632fe7d9f24dc827de54333b4a282b5a Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 29 Jan 2021 21:47:15 +0100 Subject: [PATCH] test: remove HAVE_ASSERT from coverage tests --- test/ad_parser/Makefile | 2 +- test/att_db/Makefile | 2 +- test/att_db/btstack_config.h | 1 - test/auto-pts/btstack_config.h | 2 -- test/avdtp_util/Makefile | 2 +- test/base64/Makefile | 2 +- test/ble_client/Makefile | 2 +- test/ble_client/btstack_config.h | 1 - test/btstack_config.h | 2 -- test/btstack_link_key_db/Makefile | 2 +- test/btstack_memory/Makefile | 2 +- test/btstack_memory/config_malloc/btstack_config.h | 1 - test/btstack_memory/config_none/btstack_config.h | 1 - test/btstack_memory/config_single/btstack_config.h | 1 - test/crypto/Makefile | 2 +- test/crypto/btstack_config.h | 1 - test/des_iterator/Makefile | 2 +- test/embedded/Makefile | 2 +- test/embedded/btstack_config.h | 1 - test/flash_tlv/Makefile | 2 +- test/fuzz/btstack_config.h | 1 - test/gap/Makefile | 2 +- test/gap/btstack_config.h | 1 - test/gatt_client/Makefile | 2 +- test/gatt_server/Makefile | 2 +- test/gatt_server/btstack_config.h | 1 - test/gatt_service/Makefile | 2 +- test/hfp/Makefile | 2 +- test/hid_parser/Makefile | 2 +- test/hid_parser/btstack_config.h | 1 - test/le_device_db_tlv/Makefile | 2 +- test/le_device_db_tlv/btstack_config.h | 1 - test/linked_list/Makefile | 2 +- test/map_client/btstack_config.h | 1 - test/map_test/Makefile | 2 +- test/maths/Makefile | 2 +- test/mesh/Makefile | 2 +- test/mesh/btstack_config.h | 1 - test/obex/Makefile | 2 +- test/ring_buffer/Makefile | 2 +- test/sdp/Makefile | 2 +- test/sdp_client/Makefile | 2 +- test/security_manager/Makefile | 2 +- test/tlv_posix/Makefile | 2 +- 44 files changed, 28 insertions(+), 46 deletions(-) diff --git a/test/ad_parser/Makefile b/test/ad_parser/Makefile index b83d0f728..6efd14ee5 100644 --- a/test/ad_parser/Makefile +++ b/test/ad_parser/Makefile @@ -6,7 +6,7 @@ BTSTACK_ROOT = ../.. CFLAGS = -g -Wall -I.. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/att_db/Makefile b/test/att_db/Makefile index 5a2a83787..1d8031c4a 100644 --- a/test/att_db/Makefile +++ b/test/att_db/Makefile @@ -10,7 +10,7 @@ CFLAGS = -g -Wall \ CFLAGS += -I${BTSTACK_ROOT}/3rd-party/rijndael CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/att_db/btstack_config.h b/test/att_db/btstack_config.h index 0d3a1a960..bef2eb4ff 100644 --- a/test/att_db/btstack_config.h +++ b/test/att_db/btstack_config.h @@ -6,7 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_MALLOC #define HAVE_POSIX_FILE_IO diff --git a/test/auto-pts/btstack_config.h b/test/auto-pts/btstack_config.h index bbff5dbed..1f23b813f 100644 --- a/test/auto-pts/btstack_config.h +++ b/test/auto-pts/btstack_config.h @@ -6,8 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_MALLOC #define HAVE_POSIX_FILE_IO diff --git a/test/avdtp_util/Makefile b/test/avdtp_util/Makefile index 00c94600f..c6388459a 100644 --- a/test/avdtp_util/Makefile +++ b/test/avdtp_util/Makefile @@ -20,7 +20,7 @@ COMMON = \ CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/base64/Makefile b/test/base64/Makefile index f65a3ecc0..ff1064806 100644 --- a/test/base64/Makefile +++ b/test/base64/Makefile @@ -8,7 +8,7 @@ CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest CFLAGS = -g -Wall -I. -I../ -I${BTSTACK_ROOT}/src CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/ble_client/Makefile b/test/ble_client/Makefile index 231d11359..90402fa38 100644 --- a/test/ble_client/Makefile +++ b/test/ble_client/Makefile @@ -7,7 +7,7 @@ BTSTACK_ROOT = ../.. CFLAGS = -g -Wall -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/ble_client/btstack_config.h b/test/ble_client/btstack_config.h index 2f1d0bab3..b20fbcc09 100644 --- a/test/ble_client/btstack_config.h +++ b/test/ble_client/btstack_config.h @@ -6,7 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_MALLOC #define HAVE_POSIX_FILE_IO diff --git a/test/btstack_config.h b/test/btstack_config.h index 8a2300ffd..f441b50c1 100644 --- a/test/btstack_config.h +++ b/test/btstack_config.h @@ -6,8 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_MALLOC #define HAVE_POSIX_FILE_IO diff --git a/test/btstack_link_key_db/Makefile b/test/btstack_link_key_db/Makefile index 68efdfc5b..a20625d72 100644 --- a/test/btstack_link_key_db/Makefile +++ b/test/btstack_link_key_db/Makefile @@ -13,7 +13,7 @@ CFLAGS = -g -Wall \ -I${BTSTACK_ROOT}/3rd-party/tinydir CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/btstack_memory/Makefile b/test/btstack_memory/Makefile index 579e0d5b4..3847290b7 100644 --- a/test/btstack_memory/Makefile +++ b/test/btstack_memory/Makefile @@ -7,7 +7,7 @@ BTSTACK_ROOT = ../.. CFLAGS = -g -Wall -I${BTSTACK_ROOT}/src CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/btstack_memory/config_malloc/btstack_config.h b/test/btstack_memory/config_malloc/btstack_config.h index b27b43320..83c8d6ce5 100644 --- a/test/btstack_memory/config_malloc/btstack_config.h +++ b/test/btstack_memory/config_malloc/btstack_config.h @@ -6,7 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_POSIX_FILE_IO #define HAVE_POSIX_TIME diff --git a/test/btstack_memory/config_none/btstack_config.h b/test/btstack_memory/config_none/btstack_config.h index 94f2af507..429bcf3da 100644 --- a/test/btstack_memory/config_none/btstack_config.h +++ b/test/btstack_memory/config_none/btstack_config.h @@ -6,7 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_POSIX_FILE_IO #define HAVE_POSIX_TIME diff --git a/test/btstack_memory/config_single/btstack_config.h b/test/btstack_memory/config_single/btstack_config.h index 3f7447a0a..a3c13f6a5 100644 --- a/test/btstack_memory/config_single/btstack_config.h +++ b/test/btstack_memory/config_single/btstack_config.h @@ -6,7 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_POSIX_FILE_IO #define HAVE_POSIX_TIME diff --git a/test/crypto/Makefile b/test/crypto/Makefile index 7132dc28b..ec45591a9 100644 --- a/test/crypto/Makefile +++ b/test/crypto/Makefile @@ -12,7 +12,7 @@ CFLAGS += -I${BTSTACK_ROOT}/3rd-party/micro-ecc CFLAGS += -I${BTSTACK_ROOT}/3rd-party/rijndael CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/crypto/btstack_config.h b/test/crypto/btstack_config.h index 2f1d0bab3..b20fbcc09 100644 --- a/test/crypto/btstack_config.h +++ b/test/crypto/btstack_config.h @@ -6,7 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_MALLOC #define HAVE_POSIX_FILE_IO diff --git a/test/des_iterator/Makefile b/test/des_iterator/Makefile index 0d1f19e89..811860729 100644 --- a/test/des_iterator/Makefile +++ b/test/des_iterator/Makefile @@ -7,7 +7,7 @@ BTSTACK_ROOT = ../.. CFLAGS = -g -Wall -I.. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/embedded/Makefile b/test/embedded/Makefile index 07ed09a9b..c08c4b6a4 100644 --- a/test/embedded/Makefile +++ b/test/embedded/Makefile @@ -12,7 +12,7 @@ CFLAGS = -g -Wall \ CFLAGS += -DHAVE_HAL_AUDIO CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/embedded/btstack_config.h b/test/embedded/btstack_config.h index 2f1d0bab3..b20fbcc09 100644 --- a/test/embedded/btstack_config.h +++ b/test/embedded/btstack_config.h @@ -6,7 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_MALLOC #define HAVE_POSIX_FILE_IO diff --git a/test/flash_tlv/Makefile b/test/flash_tlv/Makefile index 9d7a60242..0e10a6f83 100644 --- a/test/flash_tlv/Makefile +++ b/test/flash_tlv/Makefile @@ -27,7 +27,7 @@ CFLAGS = \ -I${BTSTACK_ROOT}/platform/embedded \ CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/fuzz/btstack_config.h b/test/fuzz/btstack_config.h index 3f14fc49d..d5f9356ae 100644 --- a/test/fuzz/btstack_config.h +++ b/test/fuzz/btstack_config.h @@ -8,7 +8,6 @@ #define FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION // Port related features -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_MALLOC #define HAVE_POSIX_FILE_IO diff --git a/test/gap/Makefile b/test/gap/Makefile index 66ef31aa1..62ad2c859 100644 --- a/test/gap/Makefile +++ b/test/gap/Makefile @@ -24,7 +24,7 @@ COMMON = \ le_device_db_memory.c \ CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/gap/btstack_config.h b/test/gap/btstack_config.h index 2f1d0bab3..b20fbcc09 100644 --- a/test/gap/btstack_config.h +++ b/test/gap/btstack_config.h @@ -6,7 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_MALLOC #define HAVE_POSIX_FILE_IO diff --git a/test/gatt_client/Makefile b/test/gatt_client/Makefile index 68acc3bf2..0a728825c 100644 --- a/test/gatt_client/Makefile +++ b/test/gatt_client/Makefile @@ -26,7 +26,7 @@ COMMON = \ mock.c \ CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/gatt_server/Makefile b/test/gatt_server/Makefile index 9ddee1490..b17df0e25 100644 --- a/test/gatt_server/Makefile +++ b/test/gatt_server/Makefile @@ -43,7 +43,7 @@ COMMON = \ ublox_spp_service_server.c \ CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/gatt_server/btstack_config.h b/test/gatt_server/btstack_config.h index bd7417a3c..9f8a22911 100644 --- a/test/gatt_server/btstack_config.h +++ b/test/gatt_server/btstack_config.h @@ -6,7 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_MALLOC #define HAVE_POSIX_FILE_IO diff --git a/test/gatt_service/Makefile b/test/gatt_service/Makefile index 98cc6b6e8..67f666782 100644 --- a/test/gatt_service/Makefile +++ b/test/gatt_service/Makefile @@ -36,7 +36,7 @@ COMMON = \ CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/hfp/Makefile b/test/hfp/Makefile index 182f5f264..da6689386 100644 --- a/test/hfp/Makefile +++ b/test/hfp/Makefile @@ -46,7 +46,7 @@ CFLAGS += -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/src/classic -I${POS # CFLAGS += -D OCTAVE_OUTPUT CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/hid_parser/Makefile b/test/hid_parser/Makefile index 391044946..968721679 100644 --- a/test/hid_parser/Makefile +++ b/test/hid_parser/Makefile @@ -16,7 +16,7 @@ COMMON = \ hci_dump.c CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/hid_parser/btstack_config.h b/test/hid_parser/btstack_config.h index 2f1d0bab3..b20fbcc09 100644 --- a/test/hid_parser/btstack_config.h +++ b/test/hid_parser/btstack_config.h @@ -6,7 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_MALLOC #define HAVE_POSIX_FILE_IO diff --git a/test/le_device_db_tlv/Makefile b/test/le_device_db_tlv/Makefile index 40638f016..aa61ca78b 100644 --- a/test/le_device_db_tlv/Makefile +++ b/test/le_device_db_tlv/Makefile @@ -26,7 +26,7 @@ COMMON = \ hal_flash_bank_memory.c \ CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/le_device_db_tlv/btstack_config.h b/test/le_device_db_tlv/btstack_config.h index 29940988b..8740fefb7 100644 --- a/test/le_device_db_tlv/btstack_config.h +++ b/test/le_device_db_tlv/btstack_config.h @@ -6,7 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_MALLOC #define HAVE_POSIX_FILE_IO diff --git a/test/linked_list/Makefile b/test/linked_list/Makefile index 23d7404b9..aebe6d762 100644 --- a/test/linked_list/Makefile +++ b/test/linked_list/Makefile @@ -17,7 +17,7 @@ COMMON = \ btstack_util.c \ CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/map_client/btstack_config.h b/test/map_client/btstack_config.h index e1a35c2ab..0a0e6fd05 100644 --- a/test/map_client/btstack_config.h +++ b/test/map_client/btstack_config.h @@ -6,7 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_MALLOC #define HAVE_POSIX_FILE_IO diff --git a/test/map_test/Makefile b/test/map_test/Makefile index be2185122..42b7571d8 100644 --- a/test/map_test/Makefile +++ b/test/map_test/Makefile @@ -26,7 +26,7 @@ COMMON = \ btstack_util.c \ CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/maths/Makefile b/test/maths/Makefile index eb83298d3..52dc1dfd5 100644 --- a/test/maths/Makefile +++ b/test/maths/Makefile @@ -9,7 +9,7 @@ CFLAGS = -g -Wall -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include LDFLAGS += -lCppUTest -lCppUTestExt CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/mesh/Makefile b/test/mesh/Makefile index 7ab382550..5f5e086ae 100644 --- a/test/mesh/Makefile +++ b/test/mesh/Makefile @@ -56,7 +56,7 @@ CFLAGS += $(shell pkg-config libusb-1.0 --cflags) LDFLAGS += $(shell pkg-config libusb-1.0 --libs) CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT # cppUTest LDFLAGS += -lCppUTest -lCppUTestExt diff --git a/test/mesh/btstack_config.h b/test/mesh/btstack_config.h index 209e0ac16..85f91347b 100644 --- a/test/mesh/btstack_config.h +++ b/test/mesh/btstack_config.h @@ -6,7 +6,6 @@ #define BTSTACK_CONFIG_H // Port related features -#define HAVE_ASSERT #define HAVE_BTSTACK_STDIN #define HAVE_MALLOC #define HAVE_POSIX_FILE_IO diff --git a/test/obex/Makefile b/test/obex/Makefile index 3b00b10fb..081992aa3 100644 --- a/test/obex/Makefile +++ b/test/obex/Makefile @@ -19,7 +19,7 @@ COMMON = \ obex_message_builder.c \ CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/ring_buffer/Makefile b/test/ring_buffer/Makefile index a334a6998..102bc3ea1 100644 --- a/test/ring_buffer/Makefile +++ b/test/ring_buffer/Makefile @@ -14,7 +14,7 @@ COMMON = \ btstack_ring_buffer.c \ CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/sdp/Makefile b/test/sdp/Makefile index 97db6f836..72b56c6b9 100644 --- a/test/sdp/Makefile +++ b/test/sdp/Makefile @@ -54,7 +54,7 @@ COMMON = \ btstack_hid_parser.c \ CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/sdp_client/Makefile b/test/sdp_client/Makefile index dfea8c1ea..1075d2944 100644 --- a/test/sdp_client/Makefile +++ b/test/sdp_client/Makefile @@ -21,7 +21,7 @@ COMMON = \ btstack_util.c \ CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/security_manager/Makefile b/test/security_manager/Makefile index c4c3d28b9..8255bfa03 100644 --- a/test/security_manager/Makefile +++ b/test/security_manager/Makefile @@ -37,7 +37,7 @@ COMMON = \ btstack_tlv.c \ CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage diff --git a/test/tlv_posix/Makefile b/test/tlv_posix/Makefile index ac0a270b9..1ac06eca7 100644 --- a/test/tlv_posix/Makefile +++ b/test/tlv_posix/Makefile @@ -28,7 +28,7 @@ CFLAGS = \ LDFLAGS += -lCppUTest -lCppUTestExt CFLAGS_COVERAGE = ${CFLAGS} -fprofile-arcs -ftest-coverage -CFLAGS_ASAN = ${CFLAGS} -fsanitize=address +CFLAGS_ASAN = ${CFLAGS} -fsanitize=address -DHAVE_ASSERT LDFLAGS += -lCppUTest -lCppUTestExt LDFLAGS_COVERAGE = ${LDFLAGS} -fprofile-arcs -ftest-coverage