You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/09/05 23:11:25 UTC

[01/12] couchdb commit: updated refs/heads/master to a5ceb62

Repository: couchdb
Updated Branches:
  refs/heads/master 475591e19 -> a5ceb62af


Set the BUILDDIR environment variable for use in eunit tests


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/3b2c3f52
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/3b2c3f52
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/3b2c3f52

Branch: refs/heads/master
Commit: 3b2c3f52e9df903469ca0d7610b3e12d43108b70
Parents: 0955cc9
Author: Russell Branca <ch...@apache.org>
Authored: Fri Aug 29 12:33:49 2014 -0700
Committer: Russell Branca <ch...@apache.org>
Committed: Fri Aug 29 13:35:00 2014 -0700

----------------------------------------------------------------------
 Makefile | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/3b2c3f52/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 8a32d4e..042af99 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,7 @@ install.mk:
 docker:
 	@docker build --no-cache --rm -t couchdb/dev-cluster .
 
+eunit: export BUILDDIR = $(shell pwd)
 eunit:
 	@rebar setup_eunit
 	@rebar eunit skip_deps=meck,mochiweb,lager


[02/12] couchdb commit: updated refs/heads/master to a5ceb62

Posted by rn...@apache.org.
Add setup_eunit rebar command

This adds a rebar plugin that introduces the setup_eunit function to
bootstrap the test ini files necessary to run the eunit test suite. It
grabs the ini template files from rel/overlay/*.ini primarily to be
able to set an absolute path for data directories and the prefix based
on the location of the CouchDB source directory.


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0955cc94
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0955cc94
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0955cc94

Branch: refs/heads/master
Commit: 0955cc946d064772aa4c0148bd28519c01dd0631
Parents: 8c24cd1
Author: Russell Branca <ch...@apache.org>
Authored: Fri Aug 29 12:32:52 2014 -0700
Committer: Russell Branca <ch...@apache.org>
Committed: Fri Aug 29 13:35:00 2014 -0700

----------------------------------------------------------------------
 .gitignore                   |  1 +
 Makefile                     |  1 +
 NOTICE                       |  4 ++++
 rebar.config.script          |  1 +
 rel/overlay/etc/eunit.ini    | 28 ++++++++++++++++++++++++++++
 rel/plugins/eunit_plugin.erl | 39 +++++++++++++++++++++++++++++++++++++++
 setup_eunit.template         | 18 ++++++++++++++++++
 7 files changed, 92 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/0955cc94/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index ad9479d..d56dc6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ rel/dev*
 rel/tmpdata
 src/
 /log
+tmp/
 
 *.o
 *.so

http://git-wip-us.apache.org/repos/asf/couchdb/blob/0955cc94/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index b323d58..8a32d4e 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,7 @@ docker:
 	@docker build --no-cache --rm -t couchdb/dev-cluster .
 
 eunit:
+	@rebar setup_eunit
 	@rebar eunit skip_deps=meck,mochiweb,lager
 
 javascript:

http://git-wip-us.apache.org/repos/asf/couchdb/blob/0955cc94/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 41c1807..fe5a4ea 100644
--- a/NOTICE
+++ b/NOTICE
@@ -193,3 +193,7 @@ This product also includes the following third-party components:
  * velocity.js (https://github.com/julianshapiro/velocity)
 
    Copyright (c) 2014 Julian Shapiro
+
+* is_base_dir function in eunit_plugin.erl (https://github.com/ChicagoBoss/ChicagoBoss/blob/master/skel/priv/rebar/boss_plugin.erl)
+
+   Copyright (c) 2009-2011 Evan Miller
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/couchdb/blob/0955cc94/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index d58d85f..e0277a4 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -65,6 +65,7 @@ AddConfig = [
     {sub_dirs, ["rel"]},
     {lib_dirs, ["src/"]},
     {erl_opts, [debug_info]},
+    {plugins, [eunit_plugin]},
     {post_hooks, [{compile, "escript support/build_js.escript"}]}
 ],
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/0955cc94/rel/overlay/etc/eunit.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/eunit.ini b/rel/overlay/etc/eunit.ini
new file mode 100644
index 0000000..50024a3
--- /dev/null
+++ b/rel/overlay/etc/eunit.ini
@@ -0,0 +1,28 @@
+; Licensed to the Apache Software Foundation (ASF) under one
+; or more contributor license agreements.  See the NOTICE file
+; distributed with this work for additional information
+; regarding copyright ownership.  The ASF licenses this file
+; to you under the Apache License, Version 2.0 (the
+; "License"); you may not use this file except in compliance
+; with the License.  You may obtain a copy of the License at
+;
+;   http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing,
+; software distributed under the License is distributed on an
+; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+; KIND, either express or implied.  See the License for the
+; specific language governing permissions and limitations
+; under the License.
+
+[couchdb]
+; time to relax!
+uuid = 74696d6520746f2072656c617821
+
+[httpd]
+port = 0
+
+[log]
+; logging is disabled to remove unwanted noise in stdout from tests processing
+level = none
+include_sasl = false

http://git-wip-us.apache.org/repos/asf/couchdb/blob/0955cc94/rel/plugins/eunit_plugin.erl
----------------------------------------------------------------------
diff --git a/rel/plugins/eunit_plugin.erl b/rel/plugins/eunit_plugin.erl
new file mode 100644
index 0000000..bbf83d2
--- /dev/null
+++ b/rel/plugins/eunit_plugin.erl
@@ -0,0 +1,39 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+-module(eunit_plugin).
+
+
+-export([setup_eunit/2]).
+
+
+setup_eunit(Config, AppFile) ->
+    case is_base_dir(Config) of
+        false -> ok;
+        true -> build_eunit_config(Config, AppFile)
+    end.
+
+
+%% from https://github.com/ChicagoBoss/ChicagoBoss/blob/master/skel/priv/rebar/boss_plugin.erl
+is_base_dir(RebarConf) ->
+    filename:absname(rebar_utils:get_cwd()) =:= rebar_config:get_xconf(RebarConf, base_dir, undefined).
+
+
+build_eunit_config(Config0, AppFile) ->
+    Cwd = filename:absname(rebar_utils:get_cwd()),
+    DataDir = Cwd ++ "/tmp/data",
+    ViewIndexDir = Cwd ++ "/tmp/data",
+    Config1 = rebar_config:set_global(Config0, template, "setup_eunit"),
+    Config2 = rebar_config:set_global(Config1, prefix, Cwd),
+    Config3 = rebar_config:set_global(Config2, data_dir, DataDir),
+    Config = rebar_config:set_global(Config3, view_index_dir, ViewIndexDir),
+    rebar_templater:create(Config, AppFile).

http://git-wip-us.apache.org/repos/asf/couchdb/blob/0955cc94/setup_eunit.template
----------------------------------------------------------------------
diff --git a/setup_eunit.template b/setup_eunit.template
new file mode 100644
index 0000000..1365970
--- /dev/null
+++ b/setup_eunit.template
@@ -0,0 +1,18 @@
+{variables, [
+    {package_author_name, "The Apache Software Foundation"},
+    {cluster_port, 5984},
+    {backend_port, 5986},
+    {node_name, "-name couchdbtest@127.0.0.1"},
+
+    {data_dir, "/tmp"},
+    {prefix, "/tmp"},
+    {view_index_dir, "/tmp"}
+]}.
+{dir, "tmp"}.
+{dir, "tmp/etc"}.
+{dir, "tmp/data"}.
+{dir, "tmp/tmp_data"}.
+{template, "rel/overlay/etc/default.ini", "tmp/etc/default_eunit.ini"}.
+{template, "rel/overlay/etc/local.ini", "tmp/etc/local_eunit.ini"}.
+{template, "rel/overlay/etc/eunit.ini", "tmp/etc/eunit.ini"}.
+{template, "rel/overlay/etc/vm.args", "tmp/etc/vm.args"}.


[09/12] couchdb commit: updated refs/heads/master to a5ceb62

Posted by rn...@apache.org.
skip folsom test suite


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1c8597ea
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1c8597ea
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1c8597ea

Branch: refs/heads/master
Commit: 1c8597ea111e92b411c9d8b7a9a9ceb5ce3bd7f7
Parents: 63d6d64
Author: Robert Newson <rn...@apache.org>
Authored: Fri Sep 5 18:29:48 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Sep 5 18:29:48 2014 +0100

----------------------------------------------------------------------
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/1c8597ea/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 4e376f0..c7a1b79 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ docker-stop:
 eunit: export BUILDDIR = $(shell pwd)
 eunit:
 	@rebar setup_eunit
-	@rebar -r eunit skip_deps=meck,mochiweb,lager,snappy,couch_replicator,fabric
+	@rebar -r eunit skip_deps=meck,mochiweb,lager,snappy,couch_replicator,fabric,folsom
 
 javascript:
 	@dev/run test/javascript/run


[10/12] couchdb commit: updated refs/heads/master to a5ceb62

Posted by rn...@apache.org.
fix makefile target dependencies


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7f9a7cff
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7f9a7cff
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7f9a7cff

Branch: refs/heads/master
Commit: 7f9a7cff23a3569527d0197b49f6a1fcce154239
Parents: 1c8597e
Author: Robert Newson <rn...@apache.org>
Authored: Fri Sep 5 18:30:30 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Sep 5 18:30:30 2014 +0100

----------------------------------------------------------------------
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/7f9a7cff/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index c7a1b79..0727521 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ clean:
 	@echo "==> couchjs (clean)"
 	@rebar -r clean
 
-check: compile javascript eunit
+check: javascript eunit
 
 
 dist: compile
@@ -64,9 +64,9 @@ docker-stop:
 	@docker stop `cat .docker-id`
 
 eunit: export BUILDDIR = $(shell pwd)
-eunit:
+eunit: compile
 	@rebar setup_eunit
 	@rebar -r eunit skip_deps=meck,mochiweb,lager,snappy,couch_replicator,fabric,folsom
 
-javascript:
+javascript: compile
 	@dev/run test/javascript/run


[07/12] couchdb commit: updated refs/heads/master to a5ceb62

Posted by rn...@apache.org.
Add NOTICE info for ?assertNotMatch macro


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/95da8e13
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/95da8e13
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/95da8e13

Branch: refs/heads/master
Commit: 95da8e13d1ccfdba2f2eaf68bd8bec501aa1280c
Parents: 9024342
Author: Russell Branca <ch...@apache.org>
Authored: Thu Sep 4 20:06:53 2014 -0700
Committer: Russell Branca <ch...@apache.org>
Committed: Thu Sep 4 20:06:53 2014 -0700

----------------------------------------------------------------------
 NOTICE | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/95da8e13/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index ed829bb..921eebf 100644
--- a/NOTICE
+++ b/NOTICE
@@ -197,3 +197,7 @@ This product also includes the following third-party components:
 * is_base_dir function in eunit_plugin.erl (https://github.com/ChicagoBoss/ChicagoBoss/blob/master/skel/priv/rebar/boss_plugin.erl)
 
    Copyright (c) 2009-2011 Evan Miller
+
+* ?assertNotMatch in couch_eunit.hrl (https://github.com/richcarl/eunit/blob/master/include/eunit.hrl#L200-L219)
+
+   Copyright (C) 2004-2006 Mickaël Rémond, Richard Carlsson


[06/12] couchdb commit: updated refs/heads/master to a5ceb62

Posted by rn...@apache.org.
Fix NOTICE whitespace


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/90243425
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/90243425
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/90243425

Branch: refs/heads/master
Commit: 9024342509f673b1ce6ce6b062882599534951d7
Parents: 36bd96a
Author: Russell Branca <ch...@apache.org>
Authored: Thu Sep 4 20:05:12 2014 -0700
Committer: Russell Branca <ch...@apache.org>
Committed: Thu Sep 4 20:05:12 2014 -0700

----------------------------------------------------------------------
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/90243425/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index fe5a4ea..ed829bb 100644
--- a/NOTICE
+++ b/NOTICE
@@ -196,4 +196,4 @@ This product also includes the following third-party components:
 
 * is_base_dir function in eunit_plugin.erl (https://github.com/ChicagoBoss/ChicagoBoss/blob/master/skel/priv/rebar/boss_plugin.erl)
 
-   Copyright (c) 2009-2011 Evan Miller
\ No newline at end of file
+   Copyright (c) 2009-2011 Evan Miller


[12/12] couchdb commit: updated refs/heads/master to a5ceb62

Posted by rn...@apache.org.
remove lies


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a5ceb62a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a5ceb62a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a5ceb62a

Branch: refs/heads/master
Commit: a5ceb62af6ee81e6cbd48cb24abd84a52575edbd
Parents: 44a5851
Author: Robert Newson <rn...@apache.org>
Authored: Fri Sep 5 22:10:01 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Sep 5 22:10:01 2014 +0100

----------------------------------------------------------------------
 Makefile | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a5ceb62a/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 35b9f79..e881f61 100644
--- a/Makefile
+++ b/Makefile
@@ -19,12 +19,10 @@ config.erl:
 	@false
 
 compile: config.erl
-	@echo "==> couchjs (compile)"
 	@rebar compile
 	@cp src/couch/priv/couchjs bin/
 
 clean:
-	@echo "==> couchjs (clean)"
 	@rebar -r clean
 
 check: javascript eunit


[11/12] couchdb commit: updated refs/heads/master to a5ceb62

Posted by rn...@apache.org.
create couchjs where eunit expects it


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/44a58516
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/44a58516
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/44a58516

Branch: refs/heads/master
Commit: 44a5851673cb2dba186e4a4250a4860be9b03ff2
Parents: 7f9a7cf
Author: Robert Newson <rn...@apache.org>
Authored: Fri Sep 5 22:09:53 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Sep 5 22:09:53 2014 +0100

----------------------------------------------------------------------
 .gitignore | 2 ++
 Makefile   | 1 +
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/44a58516/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index d56dc6b..6fd97e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@ share/server/main.js
 src/couch/priv/couch_js/config.h
 src/couch/priv/couchjs
 src/couch/priv/couchspawnkillable
+
+bin/

http://git-wip-us.apache.org/repos/asf/couchdb/blob/44a58516/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 0727521..35b9f79 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ config.erl:
 compile: config.erl
 	@echo "==> couchjs (compile)"
 	@rebar compile
+	@cp src/couch/priv/couchjs bin/
 
 clean:
 	@echo "==> couchjs (clean)"


[04/12] couchdb commit: updated refs/heads/master to a5ceb62

Posted by rn...@apache.org.
Disable problematic tests


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/63703d7e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/63703d7e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/63703d7e

Branch: refs/heads/master
Commit: 63703d7e43d2d45531834edc2d844eb9685d6c96
Parents: 3b2c3f5
Author: Russell Branca <ch...@apache.org>
Authored: Fri Aug 29 12:34:43 2014 -0700
Committer: Russell Branca <ch...@apache.org>
Committed: Fri Aug 29 13:35:33 2014 -0700

----------------------------------------------------------------------
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/63703d7e/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 042af99..1f9a54c 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ docker:
 eunit: export BUILDDIR = $(shell pwd)
 eunit:
 	@rebar setup_eunit
-	@rebar eunit skip_deps=meck,mochiweb,lager
+	@rebar -r eunit skip_deps=meck,mochiweb,lager,snappy,couch_replicator,fabric
 
 javascript:
 	@dev/run test/javascript/run


[08/12] couchdb commit: updated refs/heads/master to a5ceb62

Posted by rn...@apache.org.
Merge remote-tracking branch 'origin/1963-eunit-bigcouch'


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/63d6d640
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/63d6d640
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/63d6d640

Branch: refs/heads/master
Commit: 63d6d6409e8a721961c632075d6e2e80ff34c113
Parents: 475591e 95da8e1
Author: Robert Newson <rn...@apache.org>
Authored: Fri Sep 5 13:04:11 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Sep 5 13:04:11 2014 +0100

----------------------------------------------------------------------
 .gitignore                   |  1 +
 Makefile                     |  4 +++-
 NOTICE                       |  8 ++++++++
 rebar.config.script          | 10 ++++++----
 rel/overlay/etc/eunit.ini    | 28 ++++++++++++++++++++++++++++
 rel/plugins/eunit_plugin.erl | 39 +++++++++++++++++++++++++++++++++++++++
 setup_eunit.template         | 18 ++++++++++++++++++
 7 files changed, 103 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/63d6d640/Makefile
----------------------------------------------------------------------
diff --cc Makefile
index 71c147e,1f9a54c..4e376f0
--- a/Makefile
+++ b/Makefile
@@@ -54,17 -54,13 +54,19 @@@ install.mk
  	@echo "No install.mk found. Run ./configure"
  	@exit 1
  
 -docker:
 -	@docker build --no-cache --rm -t couchdb/dev-cluster .
 +docker-image:
 +	@docker build --rm -t couchdb/dev-cluster .
 +
 +docker-start:
 +	@docker run -d -P -t couchdb/dev-cluster > .docker-id
 +
 +docker-stop:
 +	@docker stop `cat .docker-id`
  
+ eunit: export BUILDDIR = $(shell pwd)
  eunit:
- 	@rebar eunit skip_deps=meck,mochiweb,lager
+ 	@rebar setup_eunit
+ 	@rebar -r eunit skip_deps=meck,mochiweb,lager,snappy,couch_replicator,fabric
  
  javascript:
  	@dev/run test/javascript/run


[05/12] couchdb commit: updated refs/heads/master to a5ceb62

Posted by rn...@apache.org.
TMP: enable verbose eunit output


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/36bd96a3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/36bd96a3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/36bd96a3

Branch: refs/heads/master
Commit: 36bd96a3b33616b9d332273b9f978aba5b5c243d
Parents: c7cf437
Author: Russell Branca <ch...@apache.org>
Authored: Fri Aug 29 13:45:54 2014 -0700
Committer: Russell Branca <ch...@apache.org>
Committed: Fri Aug 29 13:45:54 2014 -0700

----------------------------------------------------------------------
 rebar.config.script | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/36bd96a3/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 74ab256..029ce06 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -65,6 +65,7 @@ AddConfig = [
     {sub_dirs, ["rel"]},
     {lib_dirs, ["src/"]},
     {erl_opts, [debug_info]},
+    {eunit_opts, [verbose]},
     {plugins, [eunit_plugin]},
     {post_hooks, [{compile, "escript support/build_js.escript"}]}
 ],


[03/12] couchdb commit: updated refs/heads/master to a5ceb62

Posted by rn...@apache.org.
TMP: use 1963-eunit-bigcouch branches


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c7cf437e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c7cf437e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c7cf437e

Branch: refs/heads/master
Commit: c7cf437e1845ceecde9eb0652963e0c145ad67e3
Parents: 63703d7
Author: Russell Branca <ch...@apache.org>
Authored: Fri Aug 29 12:45:42 2014 -0700
Committer: Russell Branca <ch...@apache.org>
Committed: Fri Aug 29 13:35:33 2014 -0700

----------------------------------------------------------------------
 rebar.config.script | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c7cf437e/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index e0277a4..74ab256 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -20,12 +20,12 @@ DepDescs = [
     {b64url,            "b64url",           {branch, "master"}},
     {cassim,            "cassim",           {branch, "master"}},
     {couch_log,         "couch-log",        {branch, "master"}},
-    {config,            "config",           {branch, "master"}},
+    {config,            "config",           {branch, "1963-eunit-bigcouch"}},
     {chttpd,            "chttpd",           {branch, "master"}},
-    {couch,             "couch",            {branch, "master"}},
+    {couch,             "couch",            {branch, "1963-eunit-bigcouch"}},
     {couch_index,       "couch-index",      {branch, "master"}},
-    {couch_mrview,      "couch-mrview",     {branch, "master"}},
-    {couch_replicator,  "couch-replicator", {branch, "master"}},
+    {couch_mrview,      "couch-mrview",     {branch, "1963-eunit-bigcouch"}},
+    {couch_replicator,  "couch-replicator", {branch, "1963-eunit-bigcouch"}},
     {couch_dbupdates,   "couch-dbupdates",  {branch, "master"}},
     {couch_plugins,     "couch-plugins",    {branch, "master"}},
     {couch_event,       "couch-event",      {branch, "master"}},