From b92b397d5e4ffe10ed92fb2fc6711758ef5bcf89 Mon Sep 17 00:00:00 2001 From: Tvrtko Ursulin Date: Tue, 3 Dec 2013 15:09:57 +0000 Subject: [PATCH] build: Make sure asserts are enabled for tests Tests depend on assertions being enabled since they can, and do, contain actual test steps. They are also mandatory for ensuring sane test case behaviour. Signed-off-by: Tvrtko Ursulin Signed-off-by: Daniel Vetter --- lib/check-ndebug.h | 3 +++ tests/Android.mk | 2 +- tests/Makefile.am | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 lib/check-ndebug.h diff --git a/lib/check-ndebug.h b/lib/check-ndebug.h new file mode 100644 index 00000000..68a6ec4c --- /dev/null +++ b/lib/check-ndebug.h @@ -0,0 +1,3 @@ +#ifdef NDEBUG +#error "Testsuite needs its asserts!" +#endif diff --git a/tests/Android.mk b/tests/Android.mk index 1bd3d213..ec64acd8 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -40,7 +40,7 @@ define add_test $(LIBPCIACCESS_PATH)/include LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM - LOCAL_CFLAGS += -DANDROID + LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h" LOCAL_CFLAGS += -std=c99 # FIXME: drop once Bionic correctly annotates "noreturn" on pthread_exit LOCAL_CFLAGS += -Wno-error=return-type diff --git a/tests/Makefile.am b/tests/Makefile.am index 8e293f75..b8cddd56 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,6 +23,7 @@ CLEANFILES = $(EXTRA_PROGRAMS) AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \ -I$(srcdir)/.. \ -I$(srcdir)/../lib \ + -include "check-ndebug.h" \ -DIGT_DATADIR=\""$(abs_srcdir)"\" \ $(NULL)