You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2012/01/07 17:15:26 UTC
[2/2] git commit: Set COUCHDB_NO_START=1 to not start CouchDB during
JavaScript tests
Set COUCHDB_NO_START=1 to not start CouchDB during JavaScript tests
This restores the previous default behaviour.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/eedf901f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/eedf901f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/eedf901f
Branch: refs/heads/master
Commit: eedf901f76ec40c7cd4ce3817c45e8566c66ef87
Parents: 4d8a866
Author: Jan Lehnardt <ja...@apache.org>
Authored: Sat Jan 7 17:13:29 2012 +0100
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Sat Jan 7 17:15:20 2012 +0100
----------------------------------------------------------------------
test/javascript/run.tpl | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/eedf901f/test/javascript/run.tpl
----------------------------------------------------------------------
diff --git a/test/javascript/run.tpl b/test/javascript/run.tpl
index eb73a61..593f9ed 100644
--- a/test/javascript/run.tpl
+++ b/test/javascript/run.tpl
@@ -37,8 +37,10 @@ fi
make dev
# start CouchDB
-./utils/run -b -r 1
-sleep 1 # give it a sec
+if [ -z $COUCHDB_NO_START ]; then
+ ./utils/run -b -r 1
+ sleep 1 # give it a sec
+fi
cat $SCRIPT_DIR/json2.js \
$SCRIPT_DIR/sha1.js \
@@ -51,5 +53,7 @@ cat $SCRIPT_DIR/json2.js \
$JS_TEST_DIR/cli_runner.js \
| $COUCHJS -H -
-# stop CouchDB
-./utils/run -d
+if [ -z $COUCHDB_NO_START ]; then
+ # stop CouchDB
+ ./utils/run -d
+fi