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 2013/10/01 22:28:23 UTC
[1/2] git commit: updated refs/heads/master to 54813a7
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 <vo...@gmail.com>
Authored: Mon Sep 16 13:28:31 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
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
[2/2] git commit: updated refs/heads/master to 54813a7
Posted by ja...@apache.org.
Make JS test runner work with single file
Commit 9dfddaa7bf30d30c8fbbc4e1cc2bff4dc35dadac broke running
the JavaScript test runner with a single file. It just did
not run the test.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/54813a7c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/54813a7c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/54813a7c
Branch: refs/heads/master
Commit: 54813a7c19222556c588233f61d8e596d8756967
Parents: be76882
Author: Volker Mische <vo...@gmail.com>
Authored: Mon Sep 16 13:15:51 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Tue Oct 1 22:27:53 2013 +0200
----------------------------------------------------------------------
test/javascript/run.tpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/54813a7c/test/javascript/run.tpl
----------------------------------------------------------------------
diff --git a/test/javascript/run.tpl b/test/javascript/run.tpl
index 712f49f..5f19b36 100644
--- a/test/javascript/run.tpl
+++ b/test/javascript/run.tpl
@@ -118,9 +118,9 @@ else
echo "file $1 does not exist"
exit 1
fi
- run $TEST_SRC
fi
fi
+ run $TEST_SRC
fi
if [ -z $COUCHDB_NO_START ]; then