diff options
| author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2016-12-03 13:35:28 +0000 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2016-12-03 13:35:28 +0000 |
| commit | bdcfcdb811540d61c669c39d2f3233aa15783330 (patch) | |
| tree | cfc7fa7af3daa8b978dd495b40ac41867090ba86 | |
| parent | 27f0c0959328e0ecd2468940739c9fd1773db3f1 (diff) | |
| download | gitano-bdcfcdb811540d61c669c39d2f3233aa15783330.tar.gz | |
Clean up test protocol stuff for ssh vs http
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | testing/gitano-test-tool.in | 2 | ||||
| -rw-r--r-- | testing/library.yarn | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -186,7 +186,11 @@ ifneq ($(YARN_SNAPSHOT),) YARN_ARGS += --snapshot endif -TEST_PROTO ?= SSH +TEST_PROTO ?= ssh + +ifeq ($(filter $(TEST_PROTO),ssh http),) +$(error TEST_PROTO should be ssh or http) +endif basictest: local $(TEST_BINS) $(YARN) \ diff --git a/testing/gitano-test-tool.in b/testing/gitano-test-tool.in index 35fe410..e716320 100644 --- a/testing/gitano-test-tool.in +++ b/testing/gitano-test-tool.in @@ -275,7 +275,7 @@ function cmd_runcommand_http(user, key, ...) end function cmd_runcommand(...) - if os.getenv("GTT_PROTO") == "SSH" then + if os.getenv("GTT_PROTO") == "ssh" then return cmd_runcommand_ssh(...) else return cmd_runcommand_http(...) diff --git a/testing/library.yarn b/testing/library.yarn index 023ba09..7c4d990 100644 --- a/testing/library.yarn +++ b/testing/library.yarn @@ -92,7 +92,7 @@ rsync manipulation ------------------ IMPLEMENTS ASSUMING rsync is possible - test "x$TEST_PROTO" = "xSSH" + test "x$GTT_PROTO" = "xssh" IMPLEMENTS WHEN ([a-z][a-z0-9]*) ([a-z][a-z0-9]*) rsync'?s (.*) to (.*) rsync -I --rsh="$GTT rsh $MATCH_1 $MATCH_2" "$DATADIR/$MATCH_3" "dummy:$MATCH_4/$MATCH_3" |