From 67aae04b9e2c3bc7585fe93a2e33aad187fd3750 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Wed, 19 Feb 2014 10:27:20 +0100
Subject: More error check/printout on test-runs

---
 Makefile | 84 +++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/Makefile b/Makefile
index 6498a0e..bb21cfd 100644
--- a/Makefile
+++ b/Makefile
@@ -3,87 +3,89 @@ include Makefile.files
 CFLAGS=-Werror -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -g -O2
 CXXFLAGS=$(CFLAGS)
 
-all: complete obj simple syslog filter mutex minimal disabled
+all: complete obj simple syslog filter mutex minimal simple-disabled \
+	complete-disabled
 
 complete:
-	gcc ${CFLAGS} ${HUGIN_SOURCES} main_complete.c -o hugin-complete \
+	gcc ${CFLAGS} ${HUGIN_SOURCES} main_complete.c -o hugin-$@ \
 	 -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER -DWITH_HUG_MUTEX
-	./hugin-complete || (echo "Failed"; false)
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
-	g++ ${CXXFLAGS} ${HUGIN_SOURCES} main_complete.c -o hugin-complete \
+	g++ ${CXXFLAGS} ${HUGIN_SOURCES} main_complete.c -o hugin-$@ \
 	 -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER -DWITH_HUG_MUTEX
-	./hugin-complete || (echo "Failed"; false)
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
 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 || (echo "Failed"; false)
+	g++ main_simple.o hugin.o -o hugin-$@
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
 #	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 || (echo "Failed"; false)
+	g++ main_simple.o hugin.o -o hugin-$@
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
 simple:
-	gcc ${CFLAGS} hugin.c main_simple.c -o hugin-simple
-	./hugin-simple || (echo "Failed"; false)
+	gcc ${CFLAGS} hugin.c main_simple.c -o hugin-$@
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
-	g++ ${CXXFLAGS} hugin.c main_simple.c -o hugin-simple
-	./hugin-simple || (echo "Failed"; false)
+	g++ ${CXXFLAGS} hugin.c main_simple.c -o hugin-$@
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
 minimal:
-	gcc ${CFLAGS} hugin.c main_minimal.c -o hugin-minimal
-	./hugin-minimal || (echo "Failed"; false)
+	gcc ${CFLAGS} hugin.c main_minimal.c -o hugin-$@
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
-	g++ ${CXXFLAGS} hugin.c main_minimal.c -o hugin-minimal
-	./hugin-minimal || (echo "Failed"; false)
+	g++ ${CXXFLAGS} hugin.c main_minimal.c -o hugin-$@
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
 syslog:
 	gcc ${CFLAGS} hugin.c hugin_syslog.c main_syslog.c \
-	 -o hugin-syslog -DWITH_HUG_SYSLOG
-	./hugin-syslog || (echo "Failed"; false)
+	 -o hugin-$@ -DWITH_HUG_SYSLOG
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
 	g++ ${CXXFLAGS} hugin.c hugin_syslog.c main_syslog.c \
-	 -o hugin-syslog -DWITH_HUG_SYSLOG
-	./hugin-syslog || (echo "Failed"; false)
+	 -o hugin-$@ -DWITH_HUG_SYSLOG
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
 filter:
-	gcc ${CFLAGS} hugin.c hugin_filter.c main_filter.c -o hugin-filter \
+	gcc ${CFLAGS} hugin.c hugin_filter.c main_filter.c -o hugin-$@ \
 		-DWITH_HUG_FILTER
-	./hugin-filter || (echo "Failed"; false)
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
-	g++ ${CXXFLAGS} hugin.c hugin_filter.c main_filter.c -o hugin-filter \
+	g++ ${CXXFLAGS} hugin.c hugin_filter.c main_filter.c -o hugin-$@ \
 		-DWITH_HUG_FILTER
-	./hugin-filter || (echo "Failed"; false)
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
 mutex:
-	gcc ${CFLAGS} hugin.c main_mutex.c -o hugin-mutex -DWITH_HUG_MUTEX
-	./hugin-mutex || (echo "Failed"; false)
+	gcc ${CFLAGS} hugin.c main_mutex.c -o hugin-$@ -DWITH_HUG_MUTEX
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
-	g++ ${CXXFLAGS} hugin.c main_mutex.c -o hugin-mutex -DWITH_HUG_MUTEX
-	./hugin-mutex || (echo "Failed"; false)
+	g++ ${CXXFLAGS} hugin.c main_mutex.c -o hugin-$@ -DWITH_HUG_MUTEX
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
-disabled:
-	gcc -DDISABLE_HUGIN ${CFLAGS} hugin.c main_simple.c \
-		-o hugin-simple-disabled
-	./hugin-simple-disabled || (echo "Failed"; false)
+simple-disabled:
+	gcc -DDISABLE_HUGIN ${CFLAGS} hugin.c main_simple.c -o hugin-$@
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
-	g++ -DDISABLE_HUGIN ${CXXFLAGS} hugin.c main_simple.c \
-		-o hugin-simple-disabled
-	./hugin-simple-disabled || (echo "Failed"; false)
+	g++ -DDISABLE_HUGIN ${CXXFLAGS} hugin.c main_simple.c -o hugin-$@
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
+
+complete-disabled:
 	gcc -DDISABLE_HUGIN ${CFLAGS} ${HUGIN_SOURCES} main_complete.c \
-		-o hugin-complete-disabled -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER \
+		-o hugin-$@ -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER \
 		-DWITH_HUG_MUTEX
-	./hugin-complete-disabled || (echo "Failed"; false)
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
 	g++ -DDISABLE_HUGIN ${CXXFLAGS} ${HUGIN_SOURCES} main_complete.c \
-		-o hugin-complete-disabled -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER \
+		-o hugin-$@ -DWITH_HUG_SYSLOG -DWITH_HUG_FILTER \
 		-DWITH_HUG_MUTEX
-	./hugin-complete-disabled || (echo "Failed"; false)
+	(./hugin-$@ || (echo "Failed running $@"; false) ) 2>&1
 
 clean:
-	rm -f hugin_{complete,complete-cpp,simple,syslog,filter,mutex,minimal}
+	rm -f hugin-{complete,complete-cpp,simple,syslog,filter,mutex}
+	rm -f hugin-{minimal,simple-disabled,complete-disabled,obj}
-- 
cgit v1.2.3