Add a test for DeconvolutionSharpenEffect. Not completely done yet, but basic functio...

[movit] / Makefile

diff --git a/Makefile b/Makefile
index c33d20a387e5d5d233956c79f349940499407210..1797de0086cb2c05b6a8fa88be6d452f44199436 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,79 @@
+GTEST_DIR = /usr/src/gtest
+
 CC=gcc
 CXX=g++
-CXXFLAGS=-Wall -g $(shell pkg-config --cflags eigen3 )
-LDFLAGS=-lSDL -lSDL_image -lGL -lrt
+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
+TESTS=effect_chain_test mix_effect_test gamma_expansion_effect_test gamma_compression_effect_test saturation_effect_test deconvolution_sharpen_effect_test
 
 # Core.
-OBJS=main.o util.o widgets.o effect.o effect_chain.o
+LIB_OBJS=util.o widgets.o effect.o effect_chain.o
 
 # Inputs.
-OBJS += flat_input.o
-OBJS += ycbcr_input.o
+LIB_OBJS += flat_input.o
+LIB_OBJS += ycbcr_input.o
 
 # Effects.
-OBJS += lift_gamma_gain_effect.o
-OBJS += white_balance_effect.o
-OBJS += gamma_expansion_effect.o
-OBJS += gamma_compression_effect.o
-OBJS += colorspace_conversion_effect.o
-OBJS += saturation_effect.o
-OBJS += vignette_effect.o
-OBJS += mirror_effect.o
-OBJS += blur_effect.o
-OBJS += diffusion_effect.o
-OBJS += glow_effect.o
-OBJS += mix_effect.o
-OBJS += resize_effect.o
-OBJS += deconvolution_sharpen_effect.o
-OBJS += sandbox_effect.o
-
-test: $(OBJS)
-       $(CXX) -o test $(OBJS) $(LDFLAGS)
+LIB_OBJS += lift_gamma_gain_effect.o
+LIB_OBJS += white_balance_effect.o
+LIB_OBJS += gamma_expansion_effect.o
+LIB_OBJS += gamma_compression_effect.o
+LIB_OBJS += colorspace_conversion_effect.o
+LIB_OBJS += saturation_effect.o
+LIB_OBJS += vignette_effect.o
+LIB_OBJS += mirror_effect.o
+LIB_OBJS += blur_effect.o
+LIB_OBJS += diffusion_effect.o
+LIB_OBJS += glow_effect.o
+LIB_OBJS += unsharp_mask_effect.o
+LIB_OBJS += mix_effect.o
+LIB_OBJS += resize_effect.o
+LIB_OBJS += deconvolution_sharpen_effect.o
+LIB_OBJS += sandbox_effect.o
+
+# Default target:
+all: $(TESTS) demo
+
+# Google Test and other test library functions.
+TEST_OBJS = gtest-all.o gtest_sdl_main.o test_util.o
+
+gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc
+       $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@
+gtest_sdl_main.o: gtest_sdl_main.cpp
+       $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@
+
+# Unit tests.
+effect_chain_test: effect_chain_test.o $(TEST_OBJS) libmovit.a
+       $(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)
+       $(CXX) -o demo $(DEMO_OBJS) libmovit.a $(LDFLAGS)
+
+# The library itself.
+libmovit.a: $(LIB_OBJS)
+       $(AR) rc $@ $(LIB_OBJS)
+       $(RANLIB) $@
 
 %.o: %.cpp
        $(CXX) -MMD $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
@@ -37,6 +82,13 @@ DEPS=$(OBJS:.o=.d)
 -include $(DEPS)
 
 clean:
-       $(RM) test $(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 || FAIL=1; \
+       done; \
+       exit $$FAIL
 
-.PHONY: clean
+.PHONY: clean check all