tests: Ensure we don't disable asserts
Change-Id: Ieede7bc3c7b9d7dadc48a41b54dbe6c2b474c555
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
diff --git a/Makefile.am b/Makefile.am
index 384af50..abaa980 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,11 @@
check_PROGRAMS =
XFAIL_TESTS =
+AM_LIBS = $(CODE_COVERAGE_LIBS)
+AM_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) -UNDEBUG
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+AM_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
+
include test/Makefile.am.include
include vpnor/test/Makefile.am.include
diff --git a/bootstrap.sh b/bootstrap.sh
index eb8056f..2abd0f4 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -55,7 +55,6 @@
dev)
FLAGS="-fsanitize=address -fsanitize=leak -fsanitize=undefined -Wall -Werror"
./configure \
- CPPFLAGS="-UNDEBUG" \
CFLAGS="${FLAGS}" \
CXXFLAGS="${FLAGS}" \
--enable-code-coverage \
diff --git a/test/Makefile.am.include b/test/Makefile.am.include
index 4251247..264d704 100644
--- a/test/Makefile.am.include
+++ b/test/Makefile.am.include
@@ -1,8 +1,3 @@
-AM_LIBS = $(CODE_COVERAGE_LIBS)
-AM_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
-AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
-AM_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-
test_sanity_SOURCES = %reldir%/sanity.c
test_copy_flash_SOURCES = \