summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2014-02-19 10:16:15 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2014-02-19 10:16:15 +0100
commit0928e8d64247a6a649127e20772f05abd8ad6963 (patch)
treeb852708f62d4d49bc473fb58ff7db2a7bd85c584
parent8388d086647e77451e57230f28b14e3cb3af9519 (diff)
Add error check and printout to test-runs.
-rw-r--r--Makefile35
1 files changed, 19 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index 2fcee29..6498a0e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,79 +8,82 @@ 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
- ./hugin-complete
+ ./hugin-complete || (echo "Failed"; false)
g++ ${CXXFLAGS} ${HUGIN_SOURCES} main_complete.c -o hugin-complete \
-DWITH_HUG_SYSLOG -DWITH_HUG_FILTER -DWITH_HUG_MUTEX
- ./hugin-complete
+ ./hugin-complete || (echo "Failed"; false)
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
+ ./hugin-obj || (echo "Failed"; false)
# 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
+ ./hugin-obj || (echo "Failed"; false)
simple:
gcc ${CFLAGS} hugin.c main_simple.c -o hugin-simple
- ./hugin-simple
+ ./hugin-simple || (echo "Failed"; false)
g++ ${CXXFLAGS} hugin.c main_simple.c -o hugin-simple
- ./hugin-simple
+ ./hugin-simple || (echo "Failed"; false)
minimal:
gcc ${CFLAGS} hugin.c main_minimal.c -o hugin-minimal
- ./hugin-minimal
+ ./hugin-minimal || (echo "Failed"; false)
g++ ${CXXFLAGS} hugin.c main_minimal.c -o hugin-minimal
- ./hugin-minimal
+ ./hugin-minimal || (echo "Failed"; false)
syslog:
gcc ${CFLAGS} hugin.c hugin_syslog.c main_syslog.c \
-o hugin-syslog -DWITH_HUG_SYSLOG
- ./hugin-syslog
+ ./hugin-syslog || (echo "Failed"; false)
g++ ${CXXFLAGS} hugin.c hugin_syslog.c main_syslog.c \
-o hugin-syslog -DWITH_HUG_SYSLOG
- ./hugin-syslog
+ ./hugin-syslog || (echo "Failed"; false)
filter:
gcc ${CFLAGS} hugin.c hugin_filter.c main_filter.c -o hugin-filter \
-DWITH_HUG_FILTER
+ ./hugin-filter || (echo "Failed"; false)
+
g++ ${CXXFLAGS} hugin.c hugin_filter.c main_filter.c -o hugin-filter \
-DWITH_HUG_FILTER
+ ./hugin-filter || (echo "Failed"; false)
mutex:
gcc ${CFLAGS} hugin.c main_mutex.c -o hugin-mutex -DWITH_HUG_MUTEX
- ./hugin-mutex
+ ./hugin-mutex || (echo "Failed"; false)
g++ ${CXXFLAGS} hugin.c main_mutex.c -o hugin-mutex -DWITH_HUG_MUTEX
- ./hugin-mutex
+ ./hugin-mutex || (echo "Failed"; false)
disabled:
gcc -DDISABLE_HUGIN ${CFLAGS} hugin.c main_simple.c \
-o hugin-simple-disabled
- ./hugin-simple-disabled
+ ./hugin-simple-disabled || (echo "Failed"; false)
g++ -DDISABLE_HUGIN ${CXXFLAGS} hugin.c main_simple.c \
-o hugin-simple-disabled
- ./hugin-simple-disabled
+ ./hugin-simple-disabled || (echo "Failed"; false)
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
+ ./hugin-complete-disabled || (echo "Failed"; false)
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
+ ./hugin-complete-disabled || (echo "Failed"; false)
clean:
rm -f hugin_{complete,complete-cpp,simple,syslog,filter,mutex,minimal}