couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From beno...@apache.org
Subject [1/2] couchdb commit: updated refs/heads/1994-merge-rcouch to 54f16a8
Date Sat, 15 Feb 2014 23:00:19 GMT
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 <bchesneau@gmail.com>
Authored: Sat Feb 15 23:53:12 2014 +0100
Committer: Benoit Chesneau <bchesneau@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().


Mime
View raw message