Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E24FB334 for ; Sun, 22 Jan 2012 23:44:17 +0000 (UTC) Received: (qmail 21759 invoked by uid 500); 22 Jan 2012 23:44:16 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 21702 invoked by uid 500); 22 Jan 2012 23:44:16 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 21652 invoked by uid 99); 22 Jan 2012 23:44:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jan 2012 23:44:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jan 2012 23:44:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 801D13190D9; Sun, 22 Jan 2012 23:43:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fdmanana@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [24/50] git commit: Set COUCHDB_NO_START=1 to not start CouchDB during JavaScript tests Message-Id: <20120122234313.801D13190D9@tyr.zones.apache.org> Date: Sun, 22 Jan 2012 23:43:13 +0000 (UTC) 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/COUCHDB-1342 Commit: eedf901f76ec40c7cd4ce3817c45e8566c66ef87 Parents: 4d8a866 Author: Jan Lehnardt Authored: Sat Jan 7 17:13:29 2012 +0100 Committer: Jan Lehnardt 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