X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=makefile;h=48382b25d7b29d5c7885454b86285dac1812eaec;hb=a3f2e6cf008678cfa2b1a868e38fefbe81009971;hp=08034deb07d4070f32d79d5180237effb6f8b683;hpb=a15783ba77a2c34d955d833755d6aeea7c92c784;p=calc.git

diff --git a/makefile b/makefile
index 08034de..48382b2 100644
--- a/makefile
+++ b/makefile
@@ -83,12 +83,13 @@ include $(wildcard *.ld)
 
 gcov_%:
 	$(MAKE) purge
-	GCOV="-fprofile-arcs -ftest-coverage -O0" $(MAKE)
+	GCOV="-coverage -O0" $(MAKE)
 	$(MAKE) test_$(@:gcov_%=%)
 	gcov `sed -e 's/\.exe:/.c/;s/\.o/.c/g' $(@:gcov_%=%.ld)`
 	touch gcov
 	rm -f gcov $(wildcard *.gcda *.gcno)
 	$(MAKE) purge
+	grep '#####' *.c.gcov || true
 
 %.test: %.c
 	$(call TITLE, "Building $@")
@@ -98,18 +99,18 @@ gcov_%:
 
 test_%: %.test %.exe
 	IFS=$$'\n'; RC=0; \
-	for test in `cat $< | sed 's,${<:.test=.exe},./${<:.test=.exe},g'`; do \
+	for test in `cat $< | sed 's,${<:.test=.exe},$(VALGRIND) ./${<:.test=.exe},g'`; do \
 	  echo "=== $$test ==="; \
-	  eval $(VALGRIND) $$test; \
+	  eval $$test; \
 	  [ $$? -eq 0 ] && echo -e "\033[1;32mSUCCESS\033[0;0m" \
 	                || { echo -e "\033[1;31mFAILED\033[0;0m"; RC=1; }; \
 	done; \
 	test "$$RC" -ne 1
 
 valgrind_%: %.exe
-	VALGRIND="valgrind -v --leak-check=full --show-reachable=yes --log-fd=2"; \
+	VALGRIND="valgrind -v --leak-check=full --log-fd=3"; \
 	export VALGRIND; \
-	$(MAKE) $(@:valgrind_%=test_%)
+	$(MAKE) $(@:valgrind_%=test_%) 3>$@.log
 
 %.d: %.c
 	$(call TITLE, "Building $@")
@@ -131,7 +132,7 @@ valgrind_%: %.exe
 
 %.exe: %.o %.d
 	$(call TITLE, "Building $@")
-	$(CC) $(LDFLAGS) $(shell ./getcomments.pl -p='linker:\s' -f='%' ${<:.o=.c}) $< -o $@
+	$(CC) $(LDFLAGS) $< $(shell ./getcomments.pl -p='linker:\s' -f='%' ${<:.o=.c}) -o $@
 	$(call PASS, SUCCESS)
 
 ## Phony