summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Shorin <kxepal@apache.org>2015-10-01 20:47:02 +0300
committerAlexander Shorin <kxepal@apache.org>2015-10-01 20:47:02 +0300
commit5b95ae0fcfd79dfb2b334fad59bb10642c7aceb9 (patch)
tree63e3e43dabbcfca2d77269b0635ee0debae69ab1
parente9ba4112144e7790a1fde7edaff3f5a0a1341965 (diff)
downloadcouchdb-5b95ae0fcfd79dfb2b334fad59bb10642c7aceb9.tar.gz
Revert "Merge branch 'reduce-log-noise-for-eunit'"
This reverts commit 57171e781c5cd0579ee81040ee47199affb79e84, reversing changes made to 11b4fcd98bbebfea0eef4f5c18ecd2163bae2941.
-rw-r--r--Makefile1
-rw-r--r--rel/files/eunit.config16
2 files changed, 0 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index e3162b639..a56ff3297 100644
--- a/Makefile
+++ b/Makefile
@@ -155,7 +155,6 @@ docker-stop:
@docker stop `cat .docker-id`
eunit: export BUILDDIR = $(shell pwd)
-eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit
eunit: couch
@${REBAR} setup_eunit
@${REBAR} -r eunit skip_deps=meck,mochiweb,lager,snappy,folsom
diff --git a/rel/files/eunit.config b/rel/files/eunit.config
deleted file mode 100644
index c785643ae..000000000
--- a/rel/files/eunit.config
+++ /dev/null
@@ -1,16 +0,0 @@
-% 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}]}
-]. \ No newline at end of file