summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2014-03-14 17:28:22 +0000
committerDaniel Silverstone <dsilvers@digital-scurf.org>2014-03-14 17:28:22 +0000
commitb5503750fcf752ba612d388e6cf3c39d86e38c73 (patch)
tree457dd64441bb8711beab64c0fefc516afe3b5357
parent98d9af920fb8052b47fdf7cbf2affa5617b6f089 (diff)
downloadgitano-b5503750fcf752ba612d388e6cf3c39d86e38c73.tar.bz2
Allow tests to run even when not inside gitano-all
-rw-r--r--Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cab0162..9651c0e 100644
--- a/Makefile
+++ b/Makefile
@@ -155,9 +155,17 @@ install-plugins:
install -m 644 plugins/$$PLUGIN $(DESTDIR)$(INST_ROOT)/lib/gitano/plugins; \
done
+YARN_ARGS :=
+ifneq ($(LUA_PATH),)
+YARN_ARGS += --env LUA_PATH="$(LUA_PATH)"
+endif
+ifneq ($(LUA_CPATH),)
+YARN_ARGS += --env LUA_CPATH="$(LUA_CPATH)"
+endif
+
test: local $(TEST_BINS)
@$(YARN) --env GTT="$$(pwd)/testing/gitano-test-tool" \
- --env LUA_PATH="$(LUA_PATH)" --env LUA_CPATH="$(LUA_CPATH)" \
+ $(YARN_ARGS) \
testing/library.yarn $(TESTS)
testing/%: testing/%.in $(GEN_BIN)