1 files changed, 19 insertions, 4 deletions

diff --git a/Mk/tests.mk b/Mk/tests.mk
index 8e63839..2efdd72 100644
--- a/Mk/tests.mk
+++ b/Mk/tests.mk
@@ -5,13 +5,13 @@ BUILDDEPS+=Mk/tests.mk
 # the few symbols those modules reference but the tests never reach.
 TESTBIN=tests/runner
 TEST_SOURCES=tests/runner.c tests/test.c tests/stubs.c tests/t_urlencoded.c tests/t_iovec.c tests/t_vector.c tests/t_random.c tests/t_hex.c tests/t_accesslist.c tests/t_scan.c tests/t_buf.c tests/t_ip.c tests/t_socket.c tests/t_mutex.c tests/t_trackerlogic.c tests/t_workqueue.c tests/t_batch.c tests/t_fdstate.c tests/t_event.c tests/t_fmt.c
-TEST_UNITS=ot_urlencoded.c ot_fmt.c ot_event.c ot_batch.c ot_fdstate.c ot_buf.c ot_ip.c ot_socket.c ot_iovec.c ot_vector.c ot_random.c ot_hex.c ot_scan.c ot_accesslist.c ot_mutex.c ot_workqueue.c trackerlogic.c
+TEST_UNITS=src/ot_urlencoded.c src/ot_fmt.c src/ot_event.c src/ot_batch.c src/ot_fdstate.c src/ot_buf.c src/ot_ip.c src/ot_socket.c src/ot_iovec.c src/ot_vector.c src/ot_random.c src/ot_hex.c src/ot_scan.c src/ot_accesslist.c src/ot_mutex.c src/ot_workqueue.c src/trackerlogic.c
 TEST_HEADERS=tests/test.h $(HEADERS)
 
 # A test binary is not a production binary, so it is built with the features
 # the tests need to reach.
 FEATURES_test=$(FEATURES) -DWANT_ACCESSLIST_BLACK -DWANT_SYNC_LIVE
-CFLAGS_test=-I. -g -O1 $(CPPFLAGS) $(OT_CFLAGS) $(FEATURES_test)
+CFLAGS_test=-Isrc -g -O1 $(CPPFLAGS) $(OT_CFLAGS) $(FEATURES_test)
 
 # clang over $(CC) because the two toolchains do not check the same things.
 CC_sanitize?=clang
@@ -29,7 +29,13 @@ LDFLAGS_integration=$(LINK) -fsanitize=address,undefined
 CFLAGS_tsan=$(OPTS_debug) $(CPPFLAGS) $(OT_CFLAGS) $(FEATURES_integration) -fsanitize=thread -fno-omit-frame-pointer
 LDFLAGS_tsan=$(LINK) -fsanitize=thread
 
-BINARIES+=$(TESTBIN) $(TESTBIN).poll $(TESTBIN).sanitize opentracker.integration opentracker.tsan
+# Live sync is a compile time feature, so reaching it from a black box test
+# needs a binary of its own. tests/integration/test_livesync.py skips itself
+# against a build without it, which is what -v is for.
+FEATURES_livesync=$(FEATURES_integration) -DWANT_SYNC_LIVE
+CFLAGS_livesync=$(OPTS_debug) $(CPPFLAGS) $(OT_CFLAGS) $(FEATURES_livesync) -fsanitize=address,undefined -fno-omit-frame-pointer
+
+BINARIES+=$(TESTBIN) $(TESTBIN).poll $(TESTBIN).sanitize opentracker.integration opentracker.tsan opentracker.livesync
 
 $(TESTBIN): $(TEST_SOURCES) $(TEST_UNITS) $(TEST_HEADERS) $(BUILDDEPS)
         $(CC) -o $@ $(CFLAGS_test) $(TEST_SOURCES) $(TEST_UNITS)
@@ -46,6 +52,9 @@ opentracker.integration: $(SOURCES) $(HEADERS) $(BUILDDEPS)
 opentracker.tsan: $(SOURCES) $(HEADERS) $(BUILDDEPS)
         $(CC) -o $@ $(CFLAGS_tsan) $(SOURCES) $(LDFLAGS_tsan)
 
+opentracker.livesync: $(SOURCES) $(HEADERS) $(BUILDDEPS)
+        $(CC) -o $@ $(CFLAGS_livesync) $(SOURCES) $(LDFLAGS_integration)
+
 check: $(TESTBIN) $(BINARY)
         ./$(TESTBIN)
 
@@ -61,12 +70,18 @@ check-integration: opentracker.integration
 check-tsan: opentracker.tsan
         OPENTRACKER=./opentracker.tsan $(PYTHON) -m unittest discover -s tests/integration
 
+# The whole suite against a build that has live sync, which is also the only
+# way the live sync tests stop skipping.
+check-livesync: opentracker.livesync
+        OPENTRACKER=./opentracker.livesync $(PYTHON) -m unittest discover -s tests/integration
+
 # Cheapest first, so a quick failure comes back quickly.
 check-all:
         $(MAKE) check
         $(MAKE) check-poll
         $(MAKE) check-sanitize
         $(MAKE) check-integration
+        $(MAKE) check-livesync
         $(MAKE) check-tsan
 
-.PHONY: check check-poll check-sanitize check-integration check-tsan check-all
+.PHONY: check check-poll check-sanitize check-integration check-livesync check-tsan check-all