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/19 21:01:10 UTC

[3/9] couchdb commit: updated refs/heads/master to c071df9

Simplify eunit target options

Now it mirrors rebar eunit options and you can preserve old habits
to specify app, suite or test to run test against:

  make eunit apps=couch suites=couch_btree

Supported options are: apps, skip_deps, suites, tests. If you need
something more specific you can use EUNIT_OPTS to specify rebar eunit
options as-is:

  make eunit EUNIT_OPTS="apps=couch suites=couch_btree"


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

Branch: refs/heads/master
Commit: af1c88b84af1cbe28722e523dc99c43778b3ef06
Parents: e5a1c9b
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Oct 17 18:53:59 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Oct 19 13:47:39 2015 +0300

----------------------------------------------------------------------
 Makefile | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/af1c88b8/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index ee202bf..3f41e20 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,19 @@ COUCHDB_VERSION = $(vsn_major).$(vsn_minor).$(vsn_patch)$(COUCHDB_VERSION_SUFFIX
 
 DESTDIR=
 
+# Rebar options
+apps=
+skip_deps=folsom,lager,meck,mochiweb,proper,snappy
+suites=
+tests=
+
+EUNIT_OPTS=$(shell echo "\
+	apps=$(apps) \
+	skip_deps=$(skip_deps) \
+	suites=$(suites) \
+	tests=$(tests) \
+	" | sed -e 's/[a-z]\+= / /g')
+
 
 ################################################################################
 # Main commands
@@ -75,12 +88,12 @@ check:
 
 
 .PHONY: eunit
-# target: eunit - Run EUnit tests, use $(EUNIT_OPTS) for custom rebar eunit params
+# target: eunit - Run EUnit tests, use EUNIT_OPTS to provide custom options
 eunit: export BUILDDIR = $(shell pwd)
 eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
 eunit: couch
 	@$(REBAR) setup_eunit 2> /dev/null
-	@$(REBAR) -r eunit skip_deps=meck,mochiweb,lager,snappy,folsom,proper $(EUNIT_OPTS)
+	@$(REBAR) -r eunit $(EUNIT_OPTS)
 
 
 .PHONY: javascript