couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [4/9] couchdb commit: updated refs/heads/1963-eunit to 2e3e693
Date Mon, 23 Jun 2014 11:56:50 GMT
Fix relative include path for couch_eunit.hrl


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

Branch: refs/heads/1963-eunit
Commit: 1330c2e3fbf4b126ffa08904232ee5eed839a73e
Parents: 8655956
Author: Alexander Shorin <kxepal@apache.org>
Authored: Wed Jun 18 15:43:38 2014 +0400
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Mon Jun 23 03:31:26 2014 +0400

----------------------------------------------------------------------
 src/couch_mrview/test/couch_mrview_all_docs_tests.erl           | 2 +-
 src/couch_mrview/test/couch_mrview_collation_tests.erl          | 2 +-
 src/couch_mrview/test/couch_mrview_compact_tests.erl            | 2 +-
 src/couch_mrview/test/couch_mrview_index_info_tests.erl         | 2 +-
 src/couch_mrview/test/couch_mrview_map_views_tests.erl          | 2 +-
 src/couch_mrview/test/couch_mrview_modules_load_tests.erl       | 2 +-
 src/couch_mrview/test/couch_mrview_red_views_tests.erl          | 2 +-
 src/couch_replicator/test/couch_replicator_compact_tests.erl    | 2 +-
 src/couch_replicator/test/couch_replicator_httpc_pool_tests.erl | 2 +-
 src/couch_replicator/test/couch_replicator_large_atts_tests.erl | 2 +-
 .../test/couch_replicator_many_leaves_tests.erl                 | 2 +-
 .../test/couch_replicator_missing_stubs_tests.erl               | 2 +-
 .../test/couch_replicator_modules_load_tests.erl                | 2 +-
 .../test/couch_replicator_use_checkpoints_tests.erl             | 2 +-
 test/couchdb/run.in                                             | 5 ++++-
 15 files changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/src/couch_mrview/test/couch_mrview_all_docs_tests.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview/test/couch_mrview_all_docs_tests.erl b/src/couch_mrview/test/couch_mrview_all_docs_tests.erl
index 6d73c68..4e098ff 100644
--- a/src/couch_mrview/test/couch_mrview_all_docs_tests.erl
+++ b/src/couch_mrview/test/couch_mrview_all_docs_tests.erl
@@ -12,7 +12,7 @@
 
 -module(couch_mrview_all_docs_tests).
 
--include("../../../test/couchdb/couch_eunit.hrl").
+-include("couch_eunit.hrl").
 -include_lib("couchdb/couch_db.hrl").
 
 -define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}).

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/src/couch_mrview/test/couch_mrview_collation_tests.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview/test/couch_mrview_collation_tests.erl b/src/couch_mrview/test/couch_mrview_collation_tests.erl
index 485fd2d..2e0b75b 100644
--- a/src/couch_mrview/test/couch_mrview_collation_tests.erl
+++ b/src/couch_mrview/test/couch_mrview_collation_tests.erl
@@ -12,7 +12,7 @@
 
 -module(couch_mrview_collation_tests).
 
--include("../../../test/couchdb/couch_eunit.hrl").
+-include("couch_eunit.hrl").
 -include_lib("couchdb/couch_db.hrl").
 
 -define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}).

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/src/couch_mrview/test/couch_mrview_compact_tests.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview/test/couch_mrview_compact_tests.erl b/src/couch_mrview/test/couch_mrview_compact_tests.erl
index 62d0362..4cb7daf 100644
--- a/src/couch_mrview/test/couch_mrview_compact_tests.erl
+++ b/src/couch_mrview/test/couch_mrview_compact_tests.erl
@@ -12,7 +12,7 @@
 
 -module(couch_mrview_compact_tests).
 
--include("../../../test/couchdb/couch_eunit.hrl").
+-include("couch_eunit.hrl").
 -include_lib("couchdb/couch_db.hrl").
 
 -define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}).

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/src/couch_mrview/test/couch_mrview_index_info_tests.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview/test/couch_mrview_index_info_tests.erl b/src/couch_mrview/test/couch_mrview_index_info_tests.erl
index 0867a72..6c30da8 100644
--- a/src/couch_mrview/test/couch_mrview_index_info_tests.erl
+++ b/src/couch_mrview/test/couch_mrview_index_info_tests.erl
@@ -12,7 +12,7 @@
 
 -module(couch_mrview_index_info_tests).
 
--include("../../../test/couchdb/couch_eunit.hrl").
+-include("couch_eunit.hrl").
 -include_lib("couchdb/couch_db.hrl").
 
 -define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}).

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/src/couch_mrview/test/couch_mrview_map_views_tests.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview/test/couch_mrview_map_views_tests.erl b/src/couch_mrview/test/couch_mrview_map_views_tests.erl
index c09490e..b364b77 100644
--- a/src/couch_mrview/test/couch_mrview_map_views_tests.erl
+++ b/src/couch_mrview/test/couch_mrview_map_views_tests.erl
@@ -12,7 +12,7 @@
 
 -module(couch_mrview_map_views_tests).
 
--include("../../../test/couchdb/couch_eunit.hrl").
+-include("couch_eunit.hrl").
 -include_lib("couchdb/couch_db.hrl").
 
 -define(TIMEOUT, 1000).

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/src/couch_mrview/test/couch_mrview_modules_load_tests.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview/test/couch_mrview_modules_load_tests.erl b/src/couch_mrview/test/couch_mrview_modules_load_tests.erl
index a6f752a..bfab646 100644
--- a/src/couch_mrview/test/couch_mrview_modules_load_tests.erl
+++ b/src/couch_mrview/test/couch_mrview_modules_load_tests.erl
@@ -12,7 +12,7 @@
 
 -module(couch_mrview_modules_load_tests).
 
--include("../../../test/couchdb/couch_eunit.hrl").
+-include("couch_eunit.hrl").
 
 
 modules_load_test_() ->

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/src/couch_mrview/test/couch_mrview_red_views_tests.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview/test/couch_mrview_red_views_tests.erl b/src/couch_mrview/test/couch_mrview_red_views_tests.erl
index 59333e8..ed6018b 100644
--- a/src/couch_mrview/test/couch_mrview_red_views_tests.erl
+++ b/src/couch_mrview/test/couch_mrview_red_views_tests.erl
@@ -12,7 +12,7 @@
 
 -module(couch_mrview_red_views_tests).
 
--include("../../../test/couchdb/couch_eunit.hrl").
+-include("couch_eunit.hrl").
 -include_lib("couchdb/couch_db.hrl").
 
 -define(TIMEOUT, 1000).

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/src/couch_replicator/test/couch_replicator_compact_tests.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator/test/couch_replicator_compact_tests.erl b/src/couch_replicator/test/couch_replicator_compact_tests.erl
index 4e019fe..05b368e 100644
--- a/src/couch_replicator/test/couch_replicator_compact_tests.erl
+++ b/src/couch_replicator/test/couch_replicator_compact_tests.erl
@@ -12,7 +12,7 @@
 
 -module(couch_replicator_compact_tests).
 
--include("../../../test/couchdb/couch_eunit.hrl").
+-include("couch_eunit.hrl").
 -include_lib("couchdb/couch_db.hrl").
 -include_lib("couch_replicator/src/couch_replicator.hrl").
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/src/couch_replicator/test/couch_replicator_httpc_pool_tests.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator/test/couch_replicator_httpc_pool_tests.erl b/src/couch_replicator/test/couch_replicator_httpc_pool_tests.erl
index 6bede4c..88534ed 100644
--- a/src/couch_replicator/test/couch_replicator_httpc_pool_tests.erl
+++ b/src/couch_replicator/test/couch_replicator_httpc_pool_tests.erl
@@ -12,7 +12,7 @@
 
 -module(couch_replicator_httpc_pool_tests).
 
--include("../../../test/couchdb/couch_eunit.hrl").
+-include("couch_eunit.hrl").
 -include_lib("couchdb/couch_db.hrl").
 
 -define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}).

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/src/couch_replicator/test/couch_replicator_large_atts_tests.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator/test/couch_replicator_large_atts_tests.erl b/src/couch_replicator/test/couch_replicator_large_atts_tests.erl
index ed7ec50..7c4e334 100644
--- a/src/couch_replicator/test/couch_replicator_large_atts_tests.erl
+++ b/src/couch_replicator/test/couch_replicator_large_atts_tests.erl
@@ -12,7 +12,7 @@
 
 -module(couch_replicator_large_atts_tests).
 
--include("../../../test/couchdb/couch_eunit.hrl").
+-include("couch_eunit.hrl").
 -include_lib("couchdb/couch_db.hrl").
 
 -define(ADMIN_ROLE, #user_ctx{roles=[<<"_admin">>]}).

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/src/couch_replicator/test/couch_replicator_many_leaves_tests.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator/test/couch_replicator_many_leaves_tests.erl b/src/couch_replicator/test/couch_replicator_many_leaves_tests.erl
index 7d0de9e..27d51db 100644
--- a/src/couch_replicator/test/couch_replicator_many_leaves_tests.erl
+++ b/src/couch_replicator/test/couch_replicator_many_leaves_tests.erl
@@ -12,7 +12,7 @@
 
 -module(couch_replicator_many_leaves_tests).
 
--include("../../../test/couchdb/couch_eunit.hrl").
+-include("couch_eunit.hrl").
 -include_lib("couchdb/couch_db.hrl").
 
 -define(ADMIN_ROLE, #user_ctx{roles=[<<"_admin">>]}).

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/src/couch_replicator/test/couch_replicator_missing_stubs_tests.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator/test/couch_replicator_missing_stubs_tests.erl b/src/couch_replicator/test/couch_replicator_missing_stubs_tests.erl
index 0c2c30d..8c64929 100644
--- a/src/couch_replicator/test/couch_replicator_missing_stubs_tests.erl
+++ b/src/couch_replicator/test/couch_replicator_missing_stubs_tests.erl
@@ -12,7 +12,7 @@
 
 -module(couch_replicator_missing_stubs_tests).
 
--include("../../../test/couchdb/couch_eunit.hrl").
+-include("couch_eunit.hrl").
 -include_lib("couchdb/couch_db.hrl").
 
 -define(ADMIN_ROLE, #user_ctx{roles=[<<"_admin">>]}).

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/src/couch_replicator/test/couch_replicator_modules_load_tests.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator/test/couch_replicator_modules_load_tests.erl b/src/couch_replicator/test/couch_replicator_modules_load_tests.erl
index cea4cc2..7107b9e 100644
--- a/src/couch_replicator/test/couch_replicator_modules_load_tests.erl
+++ b/src/couch_replicator/test/couch_replicator_modules_load_tests.erl
@@ -12,7 +12,7 @@
 
 -module(couch_replicator_modules_load_tests).
 
--include("../../../test/couchdb/couch_eunit.hrl").
+-include("couch_eunit.hrl").
 
 
 modules_load_test_() ->

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/src/couch_replicator/test/couch_replicator_use_checkpoints_tests.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator/test/couch_replicator_use_checkpoints_tests.erl b/src/couch_replicator/test/couch_replicator_use_checkpoints_tests.erl
index f09a235..5356a37 100644
--- a/src/couch_replicator/test/couch_replicator_use_checkpoints_tests.erl
+++ b/src/couch_replicator/test/couch_replicator_use_checkpoints_tests.erl
@@ -12,7 +12,7 @@
 
 -module(couch_replicator_use_checkpoints_tests).
 
--include("../../../test/couchdb/couch_eunit.hrl").
+-include("couch_eunit.hrl").
 -include_lib("couchdb/couch_db.hrl").
 
 -define(ADMIN_ROLE, #user_ctx{roles=[<<"_admin">>]}).

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1330c2e3/test/couchdb/run.in
----------------------------------------------------------------------
diff --git a/test/couchdb/run.in b/test/couchdb/run.in
index 1605e30..2982ec3 100644
--- a/test/couchdb/run.in
+++ b/test/couchdb/run.in
@@ -15,6 +15,7 @@
 %% the License.
 
 -define(BUILDDIR, "@abs_top_builddir@").
+-define(SOURCEDIR, "@abs_top_srcdir@").
 -define(TESTS_EBIN, filename:join([?BUILDDIR, "test", "couchdb", "ebin"])).
 -define(TESTS_TEMP, filename:join([?BUILDDIR, "test", "couchdb", "temp"])).
 
@@ -77,7 +78,9 @@ compile(Files) ->
     lists:map(
         fun(File)->
             io:fwrite("compile ~p~n", [File]),
-            Opts = [report, verbose, {outdir, ?TESTS_EBIN}],
+            Opts = [report, verbose, {outdir, ?TESTS_EBIN},
+                    {i, filename:join([?BUILDDIR, "test", "couchdb"])},
+                    {i, filename:join([?SOURCEDIR, "src"])}],
             {ok, Mod} = compile:file(File, Opts),
             Mod
         end,


Mime
View raw message