summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2017-07-01 11:16:53 +0100
committerDaniel Silverstone <dsilvers@digital-scurf.org>2017-07-01 11:16:53 +0100
commit1f9144c6b95cb8c949a98842dc8d9df64ba94863 (patch)
tree0b426e321867dde68787ef5c06cbcf45982deeac /Makefile
parent1b31bd6c23e4335fff859e1a82acbf97c2b0929f (diff)
downloadgall-1f9144c6b95cb8c949a98842dc8d9df64ba94863.tar.bz2
Blacklist system git2 modules while running tests
In order to run the tests safely, particularly if the git2 C module isn't built due to a missing dep we need to blacklist any system git2 module. This change also requires lua5.2 for the test suite.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index fe1db2c..506593c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ all: test
MODULES := gall gall.util gall.ll \
gall.repository gall.object gall.commit gall.tag gall.tree
-LUA_VER := 5.1
+LUA_VER := 5.2
PREFIX ?= /usr/local
@@ -35,7 +35,7 @@ install: cmodule
fi
-LUA := LUA_CPATH="$(shell pwd)/lib/?.so;;" LUA_PATH="$(shell pwd)/lib/?.lua;$(shell pwd)/extras/luacov/src/?.lua;;" lua$(LUA_VER)
+LUA := LUA_CPATH="$(shell pwd)/lib/?.so;;" LUA_PATH="$(shell pwd)/lib/?.lua;$(shell pwd)/extras/luacov/src/?.lua;;" __GALL_LL_GIT2_BLACKLIST="$(shell lua$(LUA_VER) find-git2)" lua$(LUA_VER) -e "dofile('blacklist-system-git2')"
cmodule: try-cmodule