add covering rule

diff --git a/atoi.c b/atoi.c
index 554702086f1139d9787efeb680de4bd182998871..50ec270e617189ed81e267c5814297ff95cfd247 100644 (file)
--- a/atoi.c
+++ b/atoi.c
@@ -7,7 +7,7 @@ int atoi (char *str)
 
     if (*str == '-') {
         s = 0;
-       str++;
+        str++;
     }
 
     while (*str != 0) {
@@ -20,4 +20,4 @@ int atoi (char *str)
     return (s) ? i : -i;
 }
 
-/* vim: set ts=4 sw=4 et */
+/* vim: set ts=4 sw=4 et: */

diff --git a/calc.c b/calc.c
index a26d775ce2b5b09289433bee0a3cb56ac7a2e1d8..e8c8e5ae3525a5c8a5125e0d86ae8c7645f9113f 100644 (file)
--- a/calc.c
+++ b/calc.c
@@ -129,6 +129,7 @@ int main (int argc, char *argv[])
 
 // test: calc.exe -h
 // test: calc.exe -h | awk '/usage:/ { rc=1 } END { exit (1-rc) }'
+// test: echo 1 | calc.exe -v3 | grep -q value
 // test: calc.exe -_ 2> /dev/null | awk 'END { if (NR == 0) { exit(0) } else exit (1) }'
 // test: calc.exe -_ 2>&1 | awk '/usage:/ { rc=1 } END { exit (1-rc) }'
 // test: echo "1 + 2" | calc.exe | grep -q '=> 3'
@@ -161,6 +162,7 @@ int main (int argc, char *argv[])
 // test: echo "2 ^ 3 * 4 + 5" | calc.exe | grep -q '=> 3.7e1'
 // test: echo "2 + 3 * 4 ^ 5" | calc.exe | grep -q '=> 3.074e3'
 // test: echo "2 ^ 3 * 4 + cos(5/6)" | calc.exe | grep -q '=> 3.267241e1'
-// test: echo "95-6.3*15" | calc.exe | grep -q '=> 4.999971e-1'
+// test: echo "95-6.3*15-1" | calc.exe | grep -q '=> -5.000028e-1'
+// test: echo "95-6.3+15" | calc.exe | grep -q '=> 1.037e2'
 
 /* vim: set ts=4 sw=4 et: */

diff --git a/makefile b/makefile
index 674c73f9dd9180499a8f71c068e247a5bd672437..0f6cb9b1b02be3b3ee03908b2c414822757badce 100644 (file)
--- a/makefile
+++ b/makefile
@@ -11,7 +11,7 @@ OFLAGS  = -O4 -Os
 #OFLAGS += -malign-double
 CFLAGS += -W -Wall -Wextra -g
 CFLAGS += -std=c99 -D_XOPEN_SOURCE=500
-CFLAGS += $(OFLAGS) $(INCLUDES)
+CFLAGS += $(OFLAGS) $(INCLUDES) $(GCOVER)
 LDFLAGS += -g
 
 # Targets
@@ -43,8 +43,6 @@ VALID = $(call TITLE, $(1)) && $(2) && $(call PASS, SUCCESS) || { $(call FAIL, F
 all: depends
        $(MAKE) $(ALLEXE:%=%.exe)
 
-depends: $(patsubst %.c, %.d, $(wildcard *.c)) $(patsubst %, %.ld, $(ALLEXE))
-
 count:
        wc $(wildcard *.c *.h) $(MAKEFILE_LIST)
 
@@ -54,20 +52,34 @@ clean:
        rm -f clean $(wildcard *.d *.ld *.log *.o *.test *~ .exec_*)
        $(call PASS, SUCCESS)
 
+depends: $(patsubst %.c, %.d, $(wildcard *.c)) $(patsubst %, %.ld, $(ALLEXE))
+
+gcovs:
+       $(MAKE) $(addprefix gcov_,$(ALLEXE))
+
 purge: clean
        $(call TITLE, "Purging")
        touch purge
-       rm -f purge $(ALLEXE) $(shell [ -f .targets ] && { cat .targets | sort | uniq; echo .targets; })
+       rm -f purge $(ALLEXE:%=%.exe) $(shell [ -f .targets ] && { cat .targets | sort | uniq; echo .targets; })
        $(call PASS, SUCCESS)
 
 tests: all
-       $(MAKE) $(addprefix test_,$(ALLEXE:%.exe=%))
+       $(MAKE) $(addprefix test_,$(ALLEXE))
 
 ## Main rules
 
 include $(wildcard *.d)
 include $(wildcard *.ld)
 
+gcov_%:
+       make purge
+       CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs -ftest-coverage" 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
+
 %.test: %.c
        $(call TITLE, "Building $@")
 #      awk '/\/\* *test:.*\*\// { sub(/^.*\/\* *test: */, ""); sub(/ *\*\/.*$$/, ""); print }' $< > $@
@@ -114,7 +126,7 @@ valgrind_%: %
 
 ## Phony
 
-.PHONY: clean count purge
+.PHONY: all clean count depends gcovs purge tests
 
 ## Precious