test improvements

3 files changed, 18 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 972774c..f162999 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,8 @@ obj/
 build/
 tags
 
+tests/run
+
 compile_flags.txt
+compile_commands.json
+.cache/
diff --git a/Makefile b/Makefile
index dd64148..567fb2e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,9 @@ LDFLAGS         = -lm
 BUILDDIR        = build
 SOURCEDIR       = src
 OBJECTDIR       = obj
+
 TESTDIR         = tests
+TESTFLAGS       = $(CFLAGS) -D_TEST
 
 OUTPUT          = dnsd
 
@@ -24,9 +26,9 @@ debug: CFLAGS += -g -D _DEBUG
 debug: build;
 
 test: LDFLAGS += -lcheck
-test: clean dir $(TOBJS) $(TSUBS)
+test: dir $(TOBJS) $(TSUBS)
 	@echo [LD] $(TOBJS) $(TSUBS)
-	@$(CC) $(CFLAGS) -I $(SOURCEDIR) -o $(TESTDIR)/run $(TOBJS) $(TSUBS) $(LDFLAGS)
+	@$(CC) $(TESTFLAGS) -o $(TESTDIR)/run $(TOBJS) $(TSUBS) $(LDFLAGS)
 	@$(TESTDIR)/run
 
 dir:
@@ -39,7 +41,7 @@ $(OBJECTDIR)/%.o: $(SOURCEDIR)/%.c
 
 $(TESTDIR)/%.o: $(TESTDIR)/%.c
 	@echo [TEST] $<
-	@$(CC) $(CFLAGS) -I $(SOURCEDIR) -c $< -o $@
+	@$(CC) $(TESTFLAGS) -c $< -o $@
 
 #sudo setcap 'cap_net_bind_service=+ep' /path/to/prog
 #to allow port access
@@ -57,4 +59,11 @@ clean:
 all: clean build
 
 devsetup:
-	@echo "$(CFLAGS)" | tr ' ' '\n' > compile_flags.txt
+	@echo "[" > compile_commands.json
+	@for file in $(SRCS); do \
+		echo "{\"directory\":\"$(PWD)\",\"command\":\"$(shell which $(CC)) $(CFLAGS) -c $$file\",\"file\":\"$(PWD)/$$file\"}," >> compile_commands.json;\
+	done
+	@for file in $(TESTS); do \
+		echo "{\"directory\":\"$(PWD)\",\"command\":\"$(shell which $(CC)) $(TESTFLAGS) -c $$file\",\"file\":\"$(PWD)/$$file\"}," >> compile_commands.json;\
+	done
+	@echo "]" >> compile_commands.json
diff --git a/tests/dns.c b/tests/dns.c
index c100cd4..9b8a1e9 100644
--- a/tests/dns.c
+++ b/tests/dns.c
@@ -6,7 +6,7 @@
 
 #include "tests.h"
 
-#include <dns.h>
+#include "../src/dns.h"
 
 START_TEST (dns_qname) {
 	char in[128];