Add gcov test coverage suppport

.gitignore

@@ -0,0 +1,6 @@
+*.o
+*.so
+*.gcda
+*.gcno
+lcov.info
+lcov_html

Makefile

@@ -27,6 +27,14 @@ ASM_OBJS=$(patsubst %.asm,%.o,$(ASM_SOURCES))
 OBJS=$(ASM_OBJS) $(C_OBJS)
 LIB=pyrpn.so
 
+CFLAGS_COV=$(CFLAGS) --coverage
+LDFLAGS_COV=$(LDFLAGS)
+C_OBJS_COV=$(patsubst %.c,%_cov.o,$(C_SOURCES))
+C_GCNO=$(patsubst %.o,%.gcno,$(C_OBJS_COV))
+C_GCDA=$(patsubst %.o,%.gcda,$(C_OBJS_COV))
+OBJS_COV=$(ASM_OBJS) $(C_OBJS_COV)
+LIB_COV=tests/pyrpn.so
+
 all: .deps pyrpn.so
 
 $(C_OBJS): %.o: %.c $(HEADERS)
@@ -38,6 +46,14 @@ $(ASM_OBJS): %.o: %.asm $(HEADERS)
 $(LIB): $(OBJS)
 	$(LD) $(LDFLAGS) $(PYTHON_LDFLAGS) -o $@ $^
 
+
+$(C_OBJS_COV): %_cov.o: %.c $(HEADERS)
+	$(CC) $(PYTHON_CFLAGS) $(CFLAGS_COV) -c -o $@ $<
+
+$(LIB_COV): $(OBJS_COV)
+	gcc $(LDFLAGS_COV) $(PYTHON_LDFLAGS) -o $@ $^ --coverage -lgcov
+
+
 # Doxygen documentation
 doc: doc/.doxygen.stamp
 
@@ -63,8 +79,18 @@ benchmark: $(LIB)
 		PYTHONPATH=`pwd` $(PYTHON) tests/benchmark.py 0x500 0x4000;
 		   
 
-unittest: $(LIB)
-	PYTHONPATH=`pwd` $(PYTHON) -m unittest -v -f
+unittest: $(LIB_COV)
+	cd tests;\
+		$(PYTHON) -m unittest -v -f
+
+lcov.info: unittest runtest
+	lcov --no-external --base-directory ./ --capture --directory ./ --output-file $@
+
+lcov_html: lcov.info
+	genhtml $< --output-directory $@
+
+coverage: lcov_html
+
 
 runtest:
 	make -C tests
@@ -72,6 +98,7 @@ runtest:
 clean:
 	-rm -fv $(OBJS) $(LIB) test;\
 	rm -fRv doc/.doxygen.stamp doc/* Doxyfile;\
+	rm -fRv $(OBJS_COV) $(C_GCNO) $(C_GCDA) $(LIB_COV) lcov_html lcov.info;\
 	make -C tests clean
 
 distclean: clean

tests/Makefile

@@ -11,13 +11,13 @@ checks: $(BINARIES) $(SOURCES)
 	for test_bin in $(BINARIES); do echo "Running $${test_bin}.c"; ./$$test_bin && echo "OK" || echo "fail"; done
 
 ../%.o:
-	make -C ..
+	$(MAKE) -C .. `basename "$@"`
 
 %.o: %.c
-	$(CC) -I.. $(CFLAGS) -c -o $@ $<
+	$(CC) -I .. $(CFLAGS) -c -o $@ $<
 
-test_%: test_%.o ../rpn_lib.o ../rpn_jit.o ../rpn_parse.o ../rpn_if.o ../rpn_if_default.o
-	$(CC) -I..  $(CFLAGS) -o $@ $^
+test_rpn: test_rpn.o ../rpn_lib.o ../rpn_jit_cov.o ../rpn_parse_cov.o ../rpn_if_cov.o ../rpn_if_default_cov.o
+	$(CC) -I..  $(CFLAGS) -o $@ $^ -lgcov
 	
 .PHONY: clean
 

tests/pyrpn.so

@@ -1 +0,0 @@
-../pyrpn.so

tests/tests_rpniter.py

@@ -154,6 +154,8 @@ class TestRPNIterInit(unittest.TestCase):
                  [pyrpn.const.POS_XY, pyrpn.const.RESULT_CONST_RGBA, (640,480), (255,0,0,255)],
                  [pyrpn.const.POS_LINEAR, pyrpn.const.RESULT_RGBA, (1024,)],
                  [pyrpn.const.POS_XDIM, pyrpn.const.RESULT_RGB, (4, 2, 2, 640, 480)],
+                 [pyrpn.const.POS_XY, pyrpn.const.RESULT_CONST, (1024,512),
+                     (2,)],
         ]
         for args in tests:
             rif = pyrpn.RPNIterExpr(*args)
@@ -166,6 +168,7 @@ class TestRPNIterInit(unittest.TestCase):
                 expr = pyrpn.RPNExpr(codes[key], argc)
                 with self.subTest(rif=rif, key=key, orig=orig, clone=expr):
                     self.assertEqual(orig, expr)
+            str_repr = repr(rif)
 
 
 if __name__ == '__main__':