Updated Branches: refs/heads/master 86dc2668d -> 54813a7c1
Don't start or stop if COUCHDB_NO_START is set The JavaScript test runner should not try to start or stop the CouchDB instance with ./utils/run when COUCHDB_NO_START is set. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/be76882a Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/be76882a Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/be76882a Branch: refs/heads/master Commit: be76882a5ce3c06f9f234b440e6f4dde718726d5 Parents: 86dc266 Author: Volker Mische <[email protected]> Authored: Mon Sep 16 13:28:31 2013 +0200 Committer: Jan Lehnardt <[email protected]> Committed: Tue Oct 1 22:27:50 2013 +0200 ---------------------------------------------------------------------- test/javascript/run.tpl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/be76882a/test/javascript/run.tpl ---------------------------------------------------------------------- diff --git a/test/javascript/run.tpl b/test/javascript/run.tpl index 6b8d5b8..712f49f 100644 --- a/test/javascript/run.tpl +++ b/test/javascript/run.tpl @@ -56,7 +56,9 @@ process_response() { do if [ $data = 'restart' ]; then - restart + if [ -z $COUCHDB_NO_START ]; then + restart + fi else echo "$data" fi @@ -121,6 +123,9 @@ else fi fi -stop +if [ -z $COUCHDB_NO_START ]; then + stop +fi + trap - 0 exit $RESULT
