1 files changed, 17 insertions, 2 deletions

diff --git a/Mk/tests.mk b/Mk/tests.mk
index 46f308b..2efdd72 100644
--- a/Mk/tests.mk
+++ b/Mk/tests.mk
@@ -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