You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/02/16 00:00:20 UTC
[2/2] couchdb commit: updated refs/heads/1994-merge-rcouch to 54f16a8
make test target less vebose
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/54f16a89
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/54f16a89
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/54f16a89
Branch: refs/heads/1994-merge-rcouch
Commit: 54f16a89160a970b3b215118675cfaac160f9d85
Parents: f2990cc
Author: Benoit Chesneau <bc...@gmail.com>
Authored: Sat Feb 15 23:59:18 2014 +0100
Committer: Benoit Chesneau <bc...@gmail.com>
Committed: Sat Feb 15 23:59:18 2014 +0100
----------------------------------------------------------------------
Makefile | 53 +++++++++++++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/54f16a89/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 42aec47..c5c859e 100644
--- a/Makefile
+++ b/Makefile
@@ -119,37 +119,46 @@ ERL_FLAGS=-pa $(BASE_DIR)/src/*/ebin -pa $(COUCHDB_ETAP_DIR)
export ERL_FLAGS
test: testbuild
- cd $(BASE_DIR)/src/couch_collate && \
+ @echo "==> test couch_collate"
+ @cd $(BASE_DIR)/src/couch_collate && \
prove $(BASE_DIR)/src/couch_collate/t/*.t
- prove $(COUCHDB_ETAP_DIR)/*.t
- prove $(BASE_DIR)/src/couch_mrview/test/*.t
- prove $(BASE_DIR)/src/couch_replicator/test/*.t
+ @echo "==> test couch core"
+ @prove $(COUCHDB_ETAP_DIR)/*.t
+ @echo "==> test couch_mrview"
+ @prove $(BASE_DIR)/src/couch_mrview/test/*.t
+ @echo "==> test couch_replicator"
+ @prove $(BASE_DIR)/src/couch_replicator/test/*.t
verbose-test: testbuild
- cd $(BASE_DIR)/src/couch_collate && \
+ @echo "==> test couch_collate"
+ @cd $(BASE_DIR)/src/couch_collate && \
prove -v $(BASE_DIR)/src/couch_collate/t/*.t
- prove -v $(COUCHDB_ETAP_DIR)/*.t
- prove -v $(BASE_DIR)/src/couch_mrview/test/*.t
- prove -v $(BASE_DIR)/src/couch_replicator/test/*.t
+ @echo "==> test couch core"
+ @prove -v $(COUCHDB_ETAP_DIR)/*.t
+ @echo "==> test couch_mrview"
+ @prove -v $(BASE_DIR)/src/couch_mrview/test/*.t
+ @echo "==> test couch_replicator"
+ @prove -v $(BASE_DIR)/src/couch_replicator/test/*.t
testjs: testbuild
- $(ESCRIPT) $(BASE_DIR)/test/javascript/test_js.escript
+ @$(ESCRIPT) $(BASE_DIR)/test/javascript/test_js.escript
testbuild: testclean
- $(ERLC) -v -o $(COUCHDB_ETAP_DIR) $(COUCHDB_ETAP_DIR)/etap.erl
- $(ERLC) -v -o $(COUCHDB_ETAP_DIR) $(COUCHDB_ETAP_DIR)/test_web.erl
- $(ERLC) -v -o $(COUCHDB_ETAP_DIR) $(COUCHDB_ETAP_DIR)/test_util.erl
- $(ERLC) -v -o $(COUCHDB_ETAP_DIR) $(COUCHDB_ETAP_DIR)/mustache.erl
- cc -DBSD_SOURCE $(COUCHDB_ETAP_DIR)/test_cfg_register.c \
+ @echo "==> init test environement"
+ @$(ERLC) -v -o $(COUCHDB_ETAP_DIR) $(COUCHDB_ETAP_DIR)/etap.erl
+ @$(ERLC) -v -o $(COUCHDB_ETAP_DIR) $(COUCHDB_ETAP_DIR)/test_web.erl
+ @$(ERLC) -v -o $(COUCHDB_ETAP_DIR) $(COUCHDB_ETAP_DIR)/test_util.erl
+ @$(ERLC) -v -o $(COUCHDB_ETAP_DIR) $(COUCHDB_ETAP_DIR)/mustache.erl
+ @cc -DBSD_SOURCE $(COUCHDB_ETAP_DIR)/test_cfg_register.c \
-o $(COUCHDB_ETAP_DIR)/test_cfg_register
- mkdir -p $(BASE_DIR)/test/out/data
- mkdir -p $(BASE_DIR)/test/out/bin
- mkdir -p $(BASE_DIR)/test/out/share
- mkdir -p $(BASE_DIR)/test/out/log
- cp $(BASE_DIR)/src/couch/priv/couchjs $(BASE_DIR)/test/out/bin/
- cp -r $(BASE_DIR)/share/server $(BASE_DIR)/test/out/share
- cp -r $(BASE_DIR)/share/www $(BASE_DIR)/test/out/share
- cp $(BASE_DIR)/etc/couchdb/local.ini $(BASE_DIR)/test/out/
+ @mkdir -p $(BASE_DIR)/test/out/data
+ @mkdir -p $(BASE_DIR)/test/out/bin
+ @mkdir -p $(BASE_DIR)/test/out/share
+ @mkdir -p $(BASE_DIR)/test/out/log
+ @cp $(BASE_DIR)/src/couch/priv/couchjs $(BASE_DIR)/test/out/bin/
+ @cp -r $(BASE_DIR)/share/server $(BASE_DIR)/test/out/share
+ @cp -r $(BASE_DIR)/share/www $(BASE_DIR)/test/out/share
+ @cp $(BASE_DIR)/etc/couchdb/local.ini $(BASE_DIR)/test/out/
testclean:
@rm -rf $(COUCHDB_ETAP_DIR)/*.beam