fix: use correct prepared statement for writing logs

[cassiopeia.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index ed9ae6350fe44b27439f441c7028d03da08c4df7..8d28c3ff53a04829343ade48c403ca2899365095 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,33 +1,35 @@
 MKDIR = mkdir -p
 
+BIN="bin/cassiopeia-test"
+LIBS=openssl collisiondetect
+
+CC=libtool --mode=compile gcc
+CC_DEP=g++
+CXX=libtool --mode=compile g++
+CXX_DEP=g++
+LD=libtool --mode=link g++
+
+# Debhelper messes with environment variables which leads to wrong environment variable injection
+# into CFLAGS. Therefore we do not append but override.
+CFLAGS=${ADDFLAGS} -Wall -Werror -Wextra -pedantic -std=c++11 -I../src -I../lib/openssl/include
+CXXFLAGS=$(CFLAGS)
+LDFLAGS=${ADDFLAGS} -lssl -lcrypto -ldl -lboost_unit_test_framework -L../lib/openssl -L/usr/lib/i386-linux-gnu -lpqxx -lpq
+
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
     CFLAGS += -O0
 else
     CFLAGS += -O2
 endif
 
-BIN="bin/cassiopeia-test"
-LIBS=openssl collissiondetect
-
-LT_CC=libtool --mode=compile gcc
-LT_CC_DEP=g++
-LT_CXX=libtool --mode=compile g++
-LT_CXX_DEP=g++
-LT_LD=libtool --mode=link g++
-
-CC=${LT_CC}
-CC_DEP=${LT_CC_DEP}
-CXX=${LT_CXX}
-CXX_DEP=${LT_CXX_DEP}
-LD=${LT_LD}
-
 ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-ADDFLAGS=-DNO_DAEMON
+CFLAGS+=-DNO_DAEMON -g -Og
+endif
+
+ifneq (,$(filter coverage,$(DEB_BUILD_OPTIONS)))
+    LDFLAGS += -lgcov
+    CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
-CFLAGS=-O3 -g -flto -Wall -Werror -Wextra -pedantic -std=c++11 -I../src ${ADDFLAGS}
-CXXFLAGS=$(CFLAGS)
-LDFLAGS=-O3 -g -flto -lmysqlclient -lssl -lcrypto -ldl -lboost_unit_test_framework
 
 SRC_DIR=src
 OBJ_DIR=obj
@@ -63,7 +65,7 @@ testdata:
        ./genTestData.sh
 
 build: cassiopeia-test testdata
-       ${BIN}
+       ${BIN} --log_level=warning
 
 .PHONY: install
 install: build
@@ -73,18 +75,18 @@ libs: ${LIBS}
 
 .PHONY: openssl
 openssl:
-       ${MAKE} -C ../lib/openssl
+       ${MAKE} -C ../lib openssl
 
-.PHONY: collissiondetect
-collissiondetect:
-       ${MAKE} -C ../lib/collissiondetect
+.PHONY: collisiondetect
+collisiondetect:
+       ${MAKE} -C ../lib/collisiondetect
 
 # --------
 
 cassiopeia-test: bin/cassiopeia-test
 
 bin/cassiopeia-test: libs ${FS_OBJ}
-       ${MKDIR} $(shell dirname $@) && ${LT_LD} ${LDFLAGS} -o $@ ${FS_OBJ} $(filter-out %/main.o,$(wildcard ../obj/*.o))
+       ${MKDIR} $(shell dirname $@) && ${LD} ${LDFLAGS} -o $@ ${FS_OBJ} $(filter-out ../obj/apps/%,$(wildcard ../obj/*.o) $(wildcard ../obj/*/*.o))
 
 ${DEP_DIR}/%.d: ${SRC_DIR}/%.cpp
        ${MKDIR} $(shell dirname $@) && $(CXX_DEP) $(CXXFLAGS) -M -MF $@ $<