summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Mische <volker.mische@gmail.com>2013-09-16 13:28:31 +0200
committerJan Lehnardt <jan@apache.org>2013-10-01 22:27:50 +0200
commitbe76882a5ce3c06f9f234b440e6f4dde718726d5 (patch)
tree54654e933129ddeb1e601360638620aaf91943d5
parent86dc2668ddc6f099d586fb089deb6a611198586e (diff)
downloadcouchdb-be76882a5ce3c06f9f234b440e6f4dde718726d5.tar.gz
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.
-rw-r--r--test/javascript/run.tpl9
1 files changed, 7 insertions, 2 deletions
diff --git a/test/javascript/run.tpl b/test/javascript/run.tpl
index 6b8d5b8ce..712f49fe8 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