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:32 UTC
[08/12] couchdb commit: updated refs/heads/master to a5ceb62
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