summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile12
-rw-r--r--TESTING5
2 files changed, 16 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1dff13e..5603d42 100644
--- a/Makefile
+++ b/Makefile
@@ -212,7 +212,9 @@ basictest: local plugin-check $(TEST_BINS)
$(YARN_ARGS) \
testing/library.yarn testing/01*.yarn
-test: local plugin-check $(TEST_BINS)
+test: local plugin-check sshtests httptests
+
+sshtests: $(TEST_BINS)
@echo "Running full yarns in 'ssh' mode"
@$(YARN) \
--env GTT="$$(pwd)/testing/gitano-test-tool" \
@@ -220,6 +222,9 @@ test: local plugin-check $(TEST_BINS)
--env HTTP_FIRST_TEST_PORT=$(HTTP_FIRST_TEST_PORT) \
$(YARN_ARGS) \
testing/library.yarn $(TESTS)
+
+ifeq ($(SKIP_HTTP_TESTS),)
+httptests: $(TEST_BINS)
@echo "Running full yarns in 'http' mode"
@$(YARN) \
--env GTT="$$(pwd)/testing/gitano-test-tool" \
@@ -227,6 +232,11 @@ test: local plugin-check $(TEST_BINS)
--env HTTP_FIRST_TEST_PORT=$(HTTP_FIRST_TEST_PORT) \
$(YARN_ARGS) \
testing/library.yarn $(TESTS)
+else
+httptests:
+ @echo "WARNING: Running of yarns in 'http' mode disabled."
+ @echo "WARNING: Cannot guarantee Gitano will work in HTTP mode."
+endif
testing/%: testing/%.in $(GEN_BIN)
$(call GEN_LOCAL_BIN,$<,$@)
diff --git a/TESTING b/TESTING
index 75ad654..fc5f400 100644
--- a/TESTING
+++ b/TESTING
@@ -83,6 +83,11 @@ to use set `HTTP_FIRST_TEST_PORT`. This limitation means that if your `yarn`
implementation parallelises scenarios, you must limit the parallelism to ten or
else the HTTP tests will not run successfully.
+NOTE: If you are definitely not going to use Gitano in HTTP mode, and you do
+not want to run the HTTP tests, then you can disable them by passing in
+'SKIP_HTTP_TESTS=1' on the make command line. Do not do this before submitting
+a patch for review as all tests will be run on potential merges.
+
The fundamental parts of the `testing/` directory are
=====================================================