From 8388d086647e77451e57230f28b14e3cb3af9519 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 19 Feb 2014 09:25:29 +0100 Subject: Add running of the test apps in Makefile. Reintroduce 64bit va_arg crash for testing on build server. --- Makefile | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3a23387..2fcee29 100644 --- a/Makefile +++ b/Makefile @@ -6,33 +6,49 @@ CXXFLAGS=$(CFLAGS) all: complete obj simple syslog filter mutex minimal disabled complete: - gcc ${CFLAGS} ${HUGIN_SOURCES} main_complete.c -o hugin-complete -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER -DWITH_HUG_MUTEX - g++ ${CXXFLAGS} ${HUGIN_SOURCES} main_complete.c -o hugin-complete -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER -DWITH_HUG_MUTEX + gcc ${CFLAGS} ${HUGIN_SOURCES} main_complete.c -o hugin-complete \ + -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER -DWITH_HUG_MUTEX + ./hugin-complete + + g++ ${CXXFLAGS} ${HUGIN_SOURCES} main_complete.c -o hugin-complete \ + -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER -DWITH_HUG_MUTEX + ./hugin-complete obj: # Compile hugin as c prog and link with c++ program (use hugin.hpp) g++ ${CXXFLAGS} main_simple.cc -c gcc ${CFLAGS} hugin.c -c g++ main_simple.o hugin.o -o hugin-obj + ./hugin-obj # Compile hugin as c++ prog and link with c++ program g++ ${CXXFLAGS} main_simple.c -c g++ ${CXXFLAGS} hugin.c -c g++ main_simple.o hugin.o -o hugin-obj + ./hugin-obj simple: gcc ${CFLAGS} hugin.c main_simple.c -o hugin-simple + ./hugin-simple + g++ ${CXXFLAGS} hugin.c main_simple.c -o hugin-simple + ./hugin-simple minimal: gcc ${CFLAGS} hugin.c main_minimal.c -o hugin-minimal + ./hugin-minimal + g++ ${CXXFLAGS} hugin.c main_minimal.c -o hugin-minimal + ./hugin-minimal syslog: gcc ${CFLAGS} hugin.c hugin_syslog.c main_syslog.c \ - -o hugin-syslog -DWITH_HUG_SYSLOG + -o hugin-syslog -DWITH_HUG_SYSLOG + ./hugin-syslog + g++ ${CXXFLAGS} hugin.c hugin_syslog.c main_syslog.c \ - -o hugin-syslog -DWITH_HUG_SYSLOG + -o hugin-syslog -DWITH_HUG_SYSLOG + ./hugin-syslog filter: gcc ${CFLAGS} hugin.c hugin_filter.c main_filter.c -o hugin-filter \ @@ -42,19 +58,29 @@ filter: mutex: gcc ${CFLAGS} hugin.c main_mutex.c -o hugin-mutex -DWITH_HUG_MUTEX + ./hugin-mutex + g++ ${CXXFLAGS} hugin.c main_mutex.c -o hugin-mutex -DWITH_HUG_MUTEX + ./hugin-mutex disabled: gcc -DDISABLE_HUGIN ${CFLAGS} hugin.c main_simple.c \ -o hugin-simple-disabled + ./hugin-simple-disabled + g++ -DDISABLE_HUGIN ${CXXFLAGS} hugin.c main_simple.c \ -o hugin-simple-disabled + ./hugin-simple-disabled + gcc -DDISABLE_HUGIN ${CFLAGS} ${HUGIN_SOURCES} main_complete.c \ -o hugin-complete-disabled -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER \ -DWITH_HUG_MUTEX + ./hugin-complete-disabled + g++ -DDISABLE_HUGIN ${CXXFLAGS} ${HUGIN_SOURCES} main_complete.c \ -o hugin-complete-disabled -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER \ -DWITH_HUG_MUTEX + ./hugin-complete-disabled clean: rm -f hugin_{complete,complete-cpp,simple,syslog,filter,mutex,minimal} -- cgit v1.2.3