Split the TESTS= line in the Makefile now, since it is becoming quite long.

[movit] / Makefile

diff --git a/Makefile b/Makefile
index 0ebb8841098b3e956011b012dfce2cd2b71b044d..41f0de44b172874c5d7efcea139fccb95a3418e5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,20 @@ CXXFLAGS=-Wall -g -I$(GTEST_DIR)/include $(shell pkg-config --cflags eigen3 )
 LDFLAGS=-lSDL -lSDL_image -lGL -lrt -lpthread
 RANLIB=ranlib
 
+ifeq ($(COVERAGE),1)
+CXXFLAGS += -fprofile-arcs -ftest-coverage
+LDFLAGS += -fprofile-arcs -ftest-coverage
+endif
+
 DEMO_OBJS=demo.o
+
+# Unit tests.
 TESTS=effect_chain_test
+TESTS += mix_effect_test
+TESTS += gamma_expansion_effect_test
+TESTS += gamma_compression_effect_test
+TESTS += saturation_effect_test
+TESTS += deconvolution_sharpen_effect_test
 
 # Core.
 LIB_OBJS=util.o widgets.o effect.o effect_chain.o
@@ -47,9 +59,19 @@ gtest_sdl_main.o: gtest_sdl_main.cpp
 
 # Unit tests.
 effect_chain_test: effect_chain_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ effect_chain_test.o $(TEST_OBJS) libmovit.a $(LDFLAGS)
-
-OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(GDEMO_OBJS)
+       $(CXX) -o $@ $^ $(LDFLAGS)
+mix_effect_test: mix_effect_test.o $(TEST_OBJS) libmovit.a
+       $(CXX) -o $@ $^ $(LDFLAGS)
+gamma_expansion_effect_test: gamma_expansion_effect_test.o $(TEST_OBJS) libmovit.a
+       $(CXX) -o $@ $^ $(LDFLAGS)
+gamma_compression_effect_test: gamma_compression_effect_test.o $(TEST_OBJS) libmovit.a
+       $(CXX) -o $@ $^ $(LDFLAGS)
+saturation_effect_test: saturation_effect_test.o $(TEST_OBJS) libmovit.a
+       $(CXX) -o $@ $^ $(LDFLAGS)
+deconvolution_sharpen_effect_test: deconvolution_sharpen_effect_test.o $(TEST_OBJS) libmovit.a
+       $(CXX) -o $@ $^ $(LDFLAGS)
+
+OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o)
 
 # A small demo program.
 demo: libmovit.a $(DEMO_OBJS)
@@ -67,11 +89,13 @@ DEPS=$(OBJS:.o=.d)
 -include $(DEPS)
 
 clean:
-       $(RM) demo $(TESTS) libmovit.a $(OBJS) $(DEPS)
+       $(RM) demo $(TESTS) libmovit.a $(OBJS) $(OBJS:.o=.gcno) $(OBJS:.o=.gcda) $(DEPS) step-*.dot
 
 check: $(TESTS)
+       FAIL=0; \
        for TEST in $(TESTS); do \
-           ./$$TEST; \
-       done
+           ./$$TEST || FAIL=1; \
+       done; \
+       exit $$FAIL
 
 .PHONY: clean check all