3 files changed, 42 insertions, 6 deletions
diff --git a/scripts/coverage b/scripts/coverage
new file mode 100755
index 0000000..0648355
--- /dev/null
+++ b/scripts/coverage
@@ -0,0 +1,34 @@
+#!/bin/sh
+set -eu
+
+# build covsrv binary
+make -C deps/covsrv
+
+# not super fantastic but most likely good enough
+export COVSRV_SOCKET=$(mktemp -u)
+
+# server program should always be killed at the end of a test run
+cleanup() {
+	./deps/covsrv/build/covsrv quit
+}
+
+# kill server program even if user interrupted us or something else exceptional
+# happened
+trap interrupt INT HUP TERM QUIT EXIT
+interrupt () {
+	cleanup
+	exit 1
+}
+
+# start coverage server, should create a unix socket at COVSRV_SOCKET that test
+# programs can connect to
+./deps/covsrv/build/covsrv &
+
+# run tests, pass any flags like -j to make
+make COVERAGEFLAGS="--coverage -DCOVERAGE=1" check "$@"
+
+mkdir -p coverage
+lcov --capture --directory . --out coverage/covsrv.info
+genhtml --ignore-errors range coverage/covsrv.info --out coverage
+
+exit 0
diff --git a/scripts/gen-deps b/scripts/gen-deps
index f45707c..0073980 100755
--- a/scripts/gen-deps
+++ b/scripts/gen-deps
@@ -18,7 +18,7 @@ done
 shift $((OPTIND - 1))
 
 # create all subdirectories
-mkdir -p $(echo "${@}" | tr ' ' '\n' | sed "s|[^/]*$||;s|^|${BUILD}/|" | uniq)
+mkdir -p $(echo "${@}" | tr ' ' '\n' | sed "s|[^/]*$||;s|^|${BUILD}/|" | sort -u)
 
 for s in ${@}
 do
diff --git a/scripts/makefile b/scripts/makefile
index 11229bd..08a7a88 100644
--- a/scripts/makefile
+++ b/scripts/makefile
@@ -42,13 +42,15 @@ COMPILER	!= [ -n "$(CROSS_COMPILE)" ]						\
 			|| echo $(CC)
 
 
-OBFLAGS		:= -g
+# -rdynamic is apparently platform-dependent, not sure if I want to rely on it
+#  but good enough for now
+OBFLAGS		:= -g -rdynamic
 WARNFLAGS	:= -Wall -Wextra
 
 COMPILE_FLAGS	:= $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(OBFLAGS) $(ASSERTFLAGS) \
-		   $(DEBUGFLAGS)
+		   $(DEBUGFLAGS) $(COVERAGEFLAGS)
 
-INCLUDE_FLAGS	:= -I include -I deps/conts/include
+INCLUDE_FLAGS	:= -I include -I deps/conts/include -I deps/covsrv/include
 
 COMPILE		= $(COMPILER) \
 		  $(COMPILE_FLAGS) $(DEPFLAGS) $(INCLUDE_FLAGS)
@@ -60,8 +62,8 @@ COMPILE_FWD	= $(COMPILE) $(FWD_FLAGS)
 
 -include deps.mk
 
-fwd: $(FWD_OBJS) build/gen/parser.o
-	$(COMPILE_FWD) $(FWD_OBJS) build/gen/parser.o -o $@
+fwd: $(FWD_OBJS) deps/covsrv/src/client.c build/gen/parser.o
+	$(COMPILE_FWD) $(FWD_OBJS) deps/covsrv/src/client.c build/gen/parser.o -o $@
 
 
 # might lint some common things twice