You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/10/08 13:45:33 UTC
[1/2] couchdb commit: updated refs/heads/master to af10553
Repository: couchdb
Updated Branches:
refs/heads/master cdb1a788d -> af105532c
Fix global_changes tests
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0f38f460
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0f38f460
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0f38f460
Branch: refs/heads/master
Commit: 0f38f460beae920add74c61889f3f4c54bcd2498
Parents: cdb1a78
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Oct 8 14:35:13 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Oct 8 14:43:46 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/0f38f460/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index d5f0bd6..2337e2a 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -31,7 +31,7 @@ DepDescs = [
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
{chttpd, "chttpd", "a5f5f11a2be6caa64e34e3e5d50b46e068943624"},
-{couch, "couch", "0f819309c8923f1c93fec73793d095d5ee74d0ee"},
+{couch, "couch", "6682a220fd7ab8bd11eb0c044d342592e5d62132"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "f089832ea7f759b4e655051025cc48522fee9e1b"},
{couch_replicator, "couch-replicator", "85d62d1e2b72250c329b4b10db4df1231e647933"},
[2/2] couchdb commit: updated refs/heads/master to af10553
Posted by kx...@apache.org.
Use eunit.config instead of vm.args to silence error_logger
While both handles problem well, options in vm.args eventually becomes
overridden by some internal stuff and error_logger gets his tty handler
back.
Config-way is more reliable here and also prevents us to hit exotic
issues like race with test node start or warnings about bad node name
used in tests.
So far, to run specific test without distractive noise, use
the following template:
BUILDDIR=`pwd` ERL_AFLAGS="-config `pwd`/rel/files/eunit.config` ./bin/rebar -r eunit ...
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/af105532
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/af105532
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/af105532
Branch: refs/heads/master
Commit: af105532c1186b02c837cf1109e32a465ef4b982
Parents: 0f38f46
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Oct 8 14:43:36 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Oct 8 14:44:07 2015 +0300
----------------------------------------------------------------------
Makefile | 3 ++-
rel/files/eunit.config | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/af105532/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 131e06e..e6e93a4 100644
--- a/Makefile
+++ b/Makefile
@@ -155,9 +155,10 @@ docker-stop:
@docker stop `cat .docker-id`
eunit: export BUILDDIR = $(shell pwd)
+eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
eunit: couch
@${REBAR} setup_eunit
- @ERL_FLAGS="-args_file tmp/etc/vm.args" ${REBAR} -r eunit skip_deps=meck,mochiweb,lager,snappy,folsom
+ @${REBAR} -r eunit skip_deps=meck,mochiweb,lager,snappy,folsom
javascript: all
# TODO: Fix tests to look for these files in their new path
http://git-wip-us.apache.org/repos/asf/couchdb/blob/af105532/rel/files/eunit.config
----------------------------------------------------------------------
diff --git a/rel/files/eunit.config b/rel/files/eunit.config
new file mode 100644
index 0000000..3c7457d
--- /dev/null
+++ b/rel/files/eunit.config
@@ -0,0 +1,16 @@
+% 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.
+
+[
+ {kernel, [{error_logger, silent}]},
+ {sasl, [{sasl_error_logger, false}]}
+].