1 files changed, 24 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index ae01373..d16e220 100644
--- a/Makefile
+++ b/Makefile
@@ -134,12 +134,25 @@ $(TESTBIN): $(TEST_SOURCES) $(TEST_UNITS) $(TEST_HEADERS)
 check: $(TESTBIN) $(BINARY)
         ./$(TESTBIN)
 
+# The same unit tests under the sanitizers. Use clang over $(CC) because the
+# two toolchains do not check the same things
+# Override CC_sanitize to use another compiler.
+CC_sanitize?=clang
+CFLAGS_sanitize=$(CFLAGS_test) -fsanitize=address,undefined -fno-omit-frame-pointer
+LDFLAGS_sanitize=$(LDFLAGS) -fsanitize=address,undefined
+
+$(TESTBIN).sanitize: $(TEST_SOURCES) $(TEST_UNITS) $(TEST_HEADERS)
+        $(CC_sanitize) -o $@ $(CFLAGS_sanitize) $(TEST_SOURCES) $(TEST_UNITS) $(LDFLAGS_sanitize)
+
+check-sanitize: $(TESTBIN).sanitize
+        ./$(TESTBIN).sanitize
+
 # Black box tests: these drive the real binary over the wire, so they cover
 # the event loop and the parsers working together, which the unit tests
 # cannot reach. Built with the sanitizers on, so the tracker reports its own
 # memory errors and the harness turns those into failures.
 PYTHON?=python3
-FEATURES_integration=$(FEATURES) -DWANT_IP_FROM_QUERY_STRING
+FEATURES_integration=$(FEATURES) -DWANT_IP_FROM_QUERY_STRING -DWANT_ACCESSLIST_BLACK -DWANT_KEEPALIVE
 CFLAGS_integration=$(CFLAGS) $(OPTS_debug) $(FEATURES_integration) -fsanitize=address,undefined -fno-omit-frame-pointer
 LDFLAGS_integration=$(LDFLAGS) -fsanitize=address,undefined
 
@@ -149,10 +162,18 @@ opentracker.integration: $(SOURCES) $(HEADERS)
 check-integration: opentracker.integration
         OPENTRACKER=./opentracker.integration $(PYTHON) -m unittest discover -s tests/integration
 
-.PHONY: all check check-integration clean install
+# Everything, cheapest first, so a quick failure comes back quickly.
+check-all:
+        $(MAKE) check
+        $(MAKE) check-sanitize
+        $(MAKE) check-integration
+
+.PHONY: all check check-sanitize check-integration check-all clean install
+
+BINARIES=opentracker opentracker.debug opentracker.integration proxy proxy.debug $(TESTBIN) $(TESTBIN).sanitize
 
 clean:
-        rm -rf opentracker opentracker.debug opentracker.integration proxy proxy.debug $(TESTBIN) *.o *~
+        rm -rf $(BINARIES) $(BINARIES:=.dSYM) *.o *~
 
 install:
         install -m 755 opentracker $(DESTDIR)$(BINDIR)