From 8ae1d522ae3074ef2de40c90650d7a15f0023cc2 Mon Sep 17 00:00:00 2001 From: Christopher Peplin Date: Fri, 3 Jan 2014 12:43:58 -0500 Subject: [PATCH] Build with test coverage calculation. --- .gitignore | 1 + Makefile | 32 ++++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index b4225c09..834a305d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .DS_Store *~ *.bin +build diff --git a/Makefile b/Makefile index d841c208..c3c3e5a4 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,11 @@ CC = gcc INCLUDES = -Isrc -CFLAGS = $(INCLUDES) -c -w -Wall -Werror -g -ggdb -std=gnu99 -LDFLAGS = +CFLAGS = $(INCLUDES) -c -w -Wall -Werror -g -ggdb -std=gnu++0x -coverage +LDFLAGS = -coverage -lm LDLIBS = -lcheck TEST_DIR = tests +TEST_OBJDIR = build # Guard against \r\n line endings only in Cygwin OSTYPE := $(shell uname) @@ -17,20 +18,35 @@ endif SRC = $(wildcard src/**/*.c) OBJS = $(SRC:.c=.o) -TEST_SRC = $(wildcard $(TEST_DIR)/*.c) -TEST_OBJS = $(TEST_SRC:.c=.o) -TESTS=$(patsubst %.c,%.bin,$(TEST_SRC)) +OBJS = $(patsubst %,$(TEST_OBJDIR)/%,$(SRC:.c=.o)) +TEST_SRC = $(wildcard $(TEST_DIR)/*_tests.c) +TESTS=$(patsubst %.c,$(TEST_OBJDIR)/%.bin,$(TEST_SRC)) all: $(OBJS) test: $(TESTS) @set -o $(TEST_SET_OPTS) >/dev/null 2>&1 @export SHELLOPTS - @sh runtests.sh $(TEST_DIR) + @sh runtests.sh $(TEST_OBJDIR)/$(TEST_DIR) -$(TEST_DIR)/%.bin: $(TEST_DIR)/%.o $(OBJS) +COVERAGE_INFO_FILENAME = coverage.info +COVERAGE_INFO_PATH = $(TEST_OBJDIR)/$(COVERAGE_INFO_FILENAME) +coverage: + @lcov --base-directory . --directory $(TEST_OBJDIR) --zerocounters -q + @make clean + @make test + @lcov --base-directory . --directory $(TEST_OBJDIR) -c -o $(TEST_OBJDIR)/coverage.info + @genhtml -o $(TEST_OBJDIR)/coverage -t "isotp-c test coverage" --num-spaces 4 $(COVERAGE_INFO_PATH) + @$(BROWSER) $(TEST_OBJDIR)/coverage/index.html + @echo "$(GREEN)Coverage information generated in $(TEST_OBJDIR)/coverage/index.html.$(COLOR_RESET)" + +$(TEST_OBJDIR)/%.o: %.c + @mkdir -p $(dir $@) + $(CC) $(CFLAGS) $(CC_SYMBOLS) $(INCLUDES) -o $@ $< + +$(TEST_OBJDIR)/%.bin: $(TEST_OBJDIR)/%.o $(OBJS) $(TEST_SUPPORT_OBJS) @mkdir -p $(dir $@) $(CC) $(LDFLAGS) $(CC_SYMBOLS) $(INCLUDES) -o $@ $^ $(LDLIBS) clean: - rm -rf **/*.o $(TEST_DIR)/*.bin + rm -rf $(TEST_OBJDIR) -- 2.16.6