summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@gmail.com>2016-12-18 16:53:07 +0000
committerRichard Maw <richard.maw@gmail.com>2016-12-18 16:53:07 +0000
commit3d0a66f439f849fe5e6e3a20b6197145a45d9b9f (patch)
tree3cfd0615de90d296fc04de0a4b3c923e934dd7e9 /Makefile
parent54da504203734e7ee4f1acb7d1da98a70fed8e86 (diff)
downloadgitano-3d0a66f439f849fe5e6e3a20b6197145a45d9b9f.tar.gz
testing: Run lighttpd during http tests
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 279d590..1dff13e 100644
--- a/Makefile
+++ b/Makefile
@@ -192,6 +192,10 @@ ifeq ($(filter $(TEST_PROTO),ssh http),)
$(error TEST_PROTO should be ssh or http)
endif
+ifeq ($(HTTP_FIRST_TEST_PORT),)
+HTTP_FIRST_TEST_PORT = 8080
+endif
+
plugin-check:
$(LUAC) -p $(patsubst %,plugins/%,$(PLUGINS))
for PLUGIN in $(patsubst %,plugins/%,$(PLUGINS)); do \
@@ -204,6 +208,7 @@ basictest: local plugin-check $(TEST_BINS)
@$(YARN) \
--env GTT="$$(pwd)/testing/gitano-test-tool" \
--env GTT_PROTO=$(TEST_PROTO) \
+ --env HTTP_FIRST_TEST_PORT=$(HTTP_FIRST_TEST_PORT) \
$(YARN_ARGS) \
testing/library.yarn testing/01*.yarn
@@ -212,12 +217,14 @@ test: local plugin-check $(TEST_BINS)
@$(YARN) \
--env GTT="$$(pwd)/testing/gitano-test-tool" \
--env GTT_PROTO=ssh \
+ --env HTTP_FIRST_TEST_PORT=$(HTTP_FIRST_TEST_PORT) \
$(YARN_ARGS) \
testing/library.yarn $(TESTS)
@echo "Running full yarns in 'http' mode"
@$(YARN) \
--env GTT="$$(pwd)/testing/gitano-test-tool" \
--env GTT_PROTO=http \
+ --env HTTP_FIRST_TEST_PORT=$(HTTP_FIRST_TEST_PORT) \
$(YARN_ARGS) \
testing/library.yarn $(TESTS)