Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 57360184C9 for ; Mon, 19 Oct 2015 19:01:15 +0000 (UTC) Received: (qmail 75100 invoked by uid 500); 19 Oct 2015 19:01:09 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 74917 invoked by uid 500); 19 Oct 2015 19:01:08 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 74786 invoked by uid 99); 19 Oct 2015 19:01:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Oct 2015 19:01:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BCEA1E0519; Mon, 19 Oct 2015 19:01:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Date: Mon, 19 Oct 2015 19:01:10 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Sat Oct 17 18:53:59 2015 +0300 Committer: Alexander Shorin 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