From d3296be91576b7be6d3eaab8a8078770f6896a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Tue, 28 Aug 2018 10:39:43 +0200
Subject: [PATCH] [quiz] Make a special assert for tests (which really assert
 even if DEBUG=0)

---
 quiz/Makefile                             | 2 +-
 quiz/include/quiz.h                       | 2 +-
 quiz/src/{assertions.c => assertions.cpp} | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename quiz/src/{assertions.c => assertions.cpp} (56%)

diff --git a/quiz/Makefile b/quiz/Makefile
index 7a079efcc00..a4974c93694 100644
--- a/quiz/Makefile
+++ b/quiz/Makefile
@@ -10,7 +10,7 @@ $(symbols_file): $(tests)
 	@echo "AWK     $@"
 	$(Q) awk -f quiz/src/symbols.awk $(tests) > $@
 
-runner_objs += $(addprefix quiz/src/, runner.o symbols.o i18n.o)
+runner_objs += $(addprefix quiz/src/, runner.o assertions.o symbols.o i18n.o)
 test_objs += $(subst .c,.o, $(subst .cpp,.o,$(tests)))
 
 test.$(EXE): $(runner_objs) $(test_objs)
diff --git a/quiz/include/quiz.h b/quiz/include/quiz.h
index 6db98207caa..b822903c400 100644
--- a/quiz/include/quiz.h
+++ b/quiz/include/quiz.h
@@ -13,7 +13,7 @@
 extern "C" {
 #endif
 
-void quiz_assert_true(bool condition);
+void quiz_assert(bool condition);
 void quiz_print(const char * message);
 
 #ifdef __cplusplus
diff --git a/quiz/src/assertions.c b/quiz/src/assertions.cpp
similarity index 56%
rename from quiz/src/assertions.c
rename to quiz/src/assertions.cpp
index 1ea3fab914a..6f7e227f783 100644
--- a/quiz/src/assertions.c
+++ b/quiz/src/assertions.cpp
@@ -1,7 +1,8 @@
 #include <ion.h>
 #include <quiz.h>
 
-void quiz_assert_true(bool condition) {
+void quiz_assert(bool condition) {
   if (!condition) {
+    abort();
   }
 }