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:19 UTC
[1/2] couchdb commit: updated refs/heads/1994-merge-rcouch to 54f16a8
Repository: couchdb
Updated Branches:
refs/heads/1994-merge-rcouch d8cf10297 -> 54f16a891
icu nif tests has been moved in the couch_collate application
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f2990cc3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f2990cc3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f2990cc3
Branch: refs/heads/1994-merge-rcouch
Commit: f2990cc37ddca2a50a9fd85d72f869053cf662ec
Parents: d8cf102
Author: Benoit Chesneau <bc...@gmail.com>
Authored: Sat Feb 15 23:53:12 2014 +0100
Committer: Benoit Chesneau <bc...@gmail.com>
Committed: Sat Feb 15 23:53:12 2014 +0100
----------------------------------------------------------------------
Makefile | 4 ++++
test/etap/002-icu-nif.t | 30 ------------------------------
2 files changed, 4 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f2990cc3/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 63c2fcb..42aec47 100644
--- a/Makefile
+++ b/Makefile
@@ -119,11 +119,15 @@ ERL_FLAGS=-pa $(BASE_DIR)/src/*/ebin -pa $(COUCHDB_ETAP_DIR)
export ERL_FLAGS
test: testbuild
+ 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
verbose-test: testbuild
+ 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
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f2990cc3/test/etap/002-icu-nif.t
----------------------------------------------------------------------
diff --git a/test/etap/002-icu-nif.t b/test/etap/002-icu-nif.t
deleted file mode 100755
index c1a46d3..0000000
--- a/test/etap/002-icu-nif.t
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env escript
-%% -*- erlang -*-
-
-% 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.
-
-main(_) ->
- test_util:init_code_path(),
- couch_config:start_link(test_util:config_files()),
- etap:plan(2),
- etap:is(
- couch_collate:collate(<<"foo">>, <<"bar">>),
- 1,
- "Can collate stuff"
- ),
- etap:is(
- couch_collate:collate(<<"A">>, <<"aa">>),
- -1,
- "Collate's non-ascii style."
- ),
- etap:end_tests().
[2/2] couchdb commit: updated refs/heads/1994-merge-rcouch to 54f16a8
Posted by be...@apache.org.
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