diff options
context:
space:
mode:
authorBryce Kwon <bryce@brycekwon.com>
committerBryce Kwon <bryce@brycekwon.com>
commit
parent
tree
download
Keep the Lua-less build compiling
`cgit_abort_filters` unhooks the Lua write interposer under NO_LUA too, where neither the hook nor its state exists, so `make NO_LUA=1` and the default mode of `tools/release-build.sh` have not compiled since the die path learned to take stdout back from a filter. The suite now builds that variant into `build/nolua` and runs it, and a `lua:` filter in such a build is refused with a message naming the cause instead of an unknown filter type.
Diffstat (limited to '')
-rw-r--r--Makefile11
1 file changed, 10 insertions, 1 deletion
diff --git a/Makefile b/Makefile
index 29489b0..53580f3 100644
--- a/Makefile
+++ b/Makefile
@@ -76,10 +76,19 @@ cgit:
+@$(MAKE) -C $(GITDIR) -f $(CGIT_ROOT)/$(SRCDIR)/cgit.mk \
$(CGIT_ROOT)/$(BUILDDIR)/cgit $(EXTRA_GIT_TARGETS) $(GIT_BUILD_FLAGS)
+# The same program without Lua, built beside the full one so a change cannot
+# break that configuration unnoticed. The suite runs both.
+cgit-nolua:
+ +@$(MAKE) -C $(GITDIR) -f $(CGIT_ROOT)/$(SRCDIR)/cgit.mk \
+ $(CGIT_ROOT)/$(BUILDDIR)/nolua/cgit NO_LUA=1 BUILDDIR=$(BUILDDIR)/nolua $(GIT_BUILD_FLAGS)
+
sparse:
+@$(MAKE) -C $(GITDIR) -f $(CGIT_ROOT)/$(SRCDIR)/cgit.mk $(GIT_BUILD_FLAGS) cgit-sparse
+# The two builds share the Git tree, so they are made one after the other
+# even under -j.
test: cgit-with-git
+ +@$(MAKE) cgit-nolua
+@$(MAKE) -C tests all
# The test helpers link against a fully built Git tree, so this asks the sub
@@ -119,6 +128,6 @@ tags:
@mkdir -p $(BUILDDIR)
find $(SRCDIR) -name '*.[ch]' | xargs ctags -f $(BUILDDIR)/tags
-.PHONY: all cgit cgit-with-git sparse test
+.PHONY: all cgit cgit-with-git cgit-nolua sparse test
.PHONY: install uninstall
.PHONY: clean cleanall get-git tags