You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2014/06/23 13:56:47 UTC
[1/9] couchdb commit: updated refs/heads/1963-eunit to 2e3e693
Repository: couchdb
Updated Branches:
refs/heads/1963-eunit bfb7eb994 -> 2e3e69366
Add uuid for test server
Prevents it generation during tests running and failure for
make distcheck when config file is read only.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5869b7a3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5869b7a3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5869b7a3
Branch: refs/heads/1963-eunit
Commit: 5869b7a3f934dc8bf8e77fc6d31f2c50288a058e
Parents: bfb7eb9
Author: Alexander Shorin <kx...@apache.org>
Authored: Wed Jun 18 13:31:06 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Wed Jun 18 13:31:06 2014 +0400
----------------------------------------------------------------------
test/couchdb/eunit.ini | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5869b7a3/test/couchdb/eunit.ini
----------------------------------------------------------------------
diff --git a/test/couchdb/eunit.ini b/test/couchdb/eunit.ini
index 9bf5fdb..50024a3 100644
--- a/test/couchdb/eunit.ini
+++ b/test/couchdb/eunit.ini
@@ -15,6 +15,10 @@
; specific language governing permissions and limitations
; under the License.
+[couchdb]
+; time to relax!
+uuid = 74696d6520746f2072656c617821
+
[httpd]
port = 0
[6/9] couchdb commit: updated refs/heads/1963-eunit to 2e3e693
Posted by kx...@apache.org.
Ensures that .test_design directory becomes created
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b8138bea
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b8138bea
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b8138bea
Branch: refs/heads/1963-eunit
Commit: b8138beac2dd1cbbe289ce34dd7417b5f59e6760
Parents: 033b1f1
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Jun 23 00:15:20 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Jun 23 03:31:26 2014 +0400
----------------------------------------------------------------------
test/couchdb/couchdb_views_tests.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b8138bea/test/couchdb/couchdb_views_tests.erl
----------------------------------------------------------------------
diff --git a/test/couchdb/couchdb_views_tests.erl b/test/couchdb/couchdb_views_tests.erl
index 6d81f32..c61f783 100644
--- a/test/couchdb/couchdb_views_tests.erl
+++ b/test/couchdb/couchdb_views_tests.erl
@@ -162,7 +162,7 @@ should_upgrade_legacy_view_files_test() ->
{ok, _} = file:copy(DbFilePath, filename:join([DbDir, DbFileName])),
% copy old view file into view dir
- ok = filelib:ensure_dir(filename:join([ViewDir, ".test_design"])),
+ ok = filelib:ensure_dir(filename:join([ViewDir, ".test_design"]) ++ "/"),
{ok, _} = file:copy(FixtureViewFilePath, OldViewFilePath),
% ensure old header
[4/9] couchdb commit: updated refs/heads/1963-eunit to 2e3e693
Posted by kx...@apache.org.
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 <kx...@apache.org>
Authored: Wed Jun 18 15:43:38 2014 +0400
Committer: Alexander Shorin <kx...@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,
[7/9] couchdb commit: updated refs/heads/1963-eunit to 2e3e693
Posted by kx...@apache.org.
Simplify os_daemon_configer.escript
There is no need to start couch_config, init code paths and include
anything, just need to make ejson beams available.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/73c33122
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/73c33122
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/73c33122
Branch: refs/heads/1963-eunit
Commit: 73c331228bc396cc2aac08d5a84175336118b783
Parents: 62f0560
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Jun 23 01:33:06 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Jun 23 15:55:44 2014 +0400
----------------------------------------------------------------------
.gitignore | 1 +
configure.ac | 1 +
test/couchdb/couchdb_os_daemons_tests.erl | 6 +-
test/couchdb/fixtures/Makefile.am | 5 +
.../couchdb/fixtures/os_daemon_configer.escript | 101 -------------------
.../fixtures/os_daemon_configer.escript.in | 84 +++++++++++++++
6 files changed, 96 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/73c33122/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 236aa5d..8991d29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,6 +131,7 @@ test/bench/run
test/couchdb/run
test/couchdb/include/couch_eunit.hrl
test/couchdb/fixtures/.deps/
+test/couchdb/fixtures/os_daemon_configer.escript
test/javascript/run
test/javascript/run_js_tests.sh
test/local.ini
http://git-wip-us.apache.org/repos/asf/couchdb/blob/73c33122/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 5aba06a..9dbbdd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -756,6 +756,7 @@ AC_CONFIG_FILES([test/couchdb/run])
AC_CONFIG_FILES([test/couchdb/Makefile])
AC_CONFIG_FILES([test/couchdb/include/couch_eunit.hrl])
AC_CONFIG_FILES([test/couchdb/fixtures/Makefile])
+AC_CONFIG_FILES([test/couchdb/fixtures/os_daemon_configer.escript])
AC_CONFIG_FILES([test/javascript/Makefile])
AC_CONFIG_FILES([test/view_server/Makefile])
AC_CONFIG_FILES([utils/Makefile])
http://git-wip-us.apache.org/repos/asf/couchdb/blob/73c33122/test/couchdb/couchdb_os_daemons_tests.erl
----------------------------------------------------------------------
diff --git a/test/couchdb/couchdb_os_daemons_tests.erl b/test/couchdb/couchdb_os_daemons_tests.erl
index 1058a78..ed9b6e8 100644
--- a/test/couchdb/couchdb_os_daemons_tests.erl
+++ b/test/couchdb/couchdb_os_daemons_tests.erl
@@ -34,6 +34,8 @@
-define(DAEMON_DIE_QUICKLY, "os_daemon_die_quickly.sh").
-define(DAEMON_CFGREG, "test_cfg_register").
-define(DELAY, 100).
+-define(FIXTURES_BUILDDIR,
+ filename:join([?BUILDDIR, "test", "couchdb", "fixtures"])).
-define(TIMEOUT, 1000).
@@ -42,7 +44,9 @@ setup(DName) ->
{ok, OsDPid} = couch_os_daemons:start_link(),
Path = case DName of
?DAEMON_CFGREG ->
- filename:join([?BUILDDIR, "test", "couchdb", "fixtures", DName]);
+ filename:join([?FIXTURES_BUILDDIR, DName]);
+ ?DAEMON_CONFIGER ->
+ filename:join([?FIXTURES_BUILDDIR, DName]);
_ ->
filename:join([?FIXTURESDIR, DName])
end,
http://git-wip-us.apache.org/repos/asf/couchdb/blob/73c33122/test/couchdb/fixtures/Makefile.am
----------------------------------------------------------------------
diff --git a/test/couchdb/fixtures/Makefile.am b/test/couchdb/fixtures/Makefile.am
index 1273234..fa38d3f 100644
--- a/test/couchdb/fixtures/Makefile.am
+++ b/test/couchdb/fixtures/Makefile.am
@@ -13,3 +13,8 @@
noinst_PROGRAMS = test_cfg_register
test_cfg_register_SOURCES = test_cfg_register.c
test_cfg_register_CFLAGS = -D_BSD_SOURCE
+
+noinst_SCRIPTS = os_daemon_configer.escript
+
+all:
+ chmod +x os_daemon_configer.escript
http://git-wip-us.apache.org/repos/asf/couchdb/blob/73c33122/test/couchdb/fixtures/os_daemon_configer.escript
----------------------------------------------------------------------
diff --git a/test/couchdb/fixtures/os_daemon_configer.escript b/test/couchdb/fixtures/os_daemon_configer.escript
deleted file mode 100755
index d437423..0000000
--- a/test/couchdb/fixtures/os_daemon_configer.escript
+++ /dev/null
@@ -1,101 +0,0 @@
-#! /usr/bin/env escript
-
-% 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.
-
--include("../couch_eunit.hrl").
-
-
-read() ->
- case io:get_line('') of
- eof ->
- stop;
- Data ->
- ejson:decode(Data)
- end.
-
-write(Mesg) ->
- Data = iolist_to_binary(ejson:encode(Mesg)),
- io:format(binary_to_list(Data) ++ "\n", []).
-
-get_cfg(Section) ->
- write([<<"get">>, Section]),
- read().
-
-get_cfg(Section, Name) ->
- write([<<"get">>, Section, Name]),
- read().
-
-log(Mesg) ->
- write([<<"log">>, Mesg]).
-
-log(Mesg, Level) ->
- write([<<"log">>, Mesg, {[{<<"level">>, Level}]}]).
-
-test_get_cfg1() ->
- Path = list_to_binary(?FILE),
- FileName = list_to_binary(filename:basename(?FILE)),
- {[{FileName, Path}]} = get_cfg(<<"os_daemons">>).
-
-test_get_cfg2() ->
- Path = list_to_binary(?FILE),
- FileName = list_to_binary(filename:basename(?FILE)),
- Path = get_cfg(<<"os_daemons">>, FileName),
- <<"sequential">> = get_cfg(<<"uuids">>, <<"algorithm">>).
-
-
-test_get_unknown_cfg() ->
- {[]} = get_cfg(<<"aal;3p4">>),
- null = get_cfg(<<"aal;3p4">>, <<"313234kjhsdfl">>).
-
-test_log() ->
- log(<<"foobar!">>),
- log(<<"some stuff!">>, <<"debug">>),
- log(2),
- log(true),
- write([<<"log">>, <<"stuff">>, 2]),
- write([<<"log">>, 3, null]),
- write([<<"log">>, [1, 2], {[{<<"level">>, <<"debug">>}]}]),
- write([<<"log">>, <<"true">>, {[]}]).
-
-do_tests() ->
- test_get_cfg1(),
- test_get_cfg2(),
- test_get_unknown_cfg(),
- test_log(),
- loop(io:read("")).
-
-loop({ok, _}) ->
- loop(io:read(""));
-loop(eof) ->
- init:stop();
-loop({error, _Reason}) ->
- init:stop().
-
-main([]) ->
- init_code_path(),
- couch_config:start_link(?CONFIG_CHAIN),
- couch_drv:start_link(),
- do_tests().
-
-init_code_path() ->
- Paths = [
- "couchdb",
- "ejson",
- "erlang-oauth",
- "ibrowse",
- "mochiweb",
- "snappy"
- ],
- lists:foreach(fun(Name) ->
- code:add_patha(filename:join([?BUILDDIR, "src", Name]))
- end, Paths).
http://git-wip-us.apache.org/repos/asf/couchdb/blob/73c33122/test/couchdb/fixtures/os_daemon_configer.escript.in
----------------------------------------------------------------------
diff --git a/test/couchdb/fixtures/os_daemon_configer.escript.in b/test/couchdb/fixtures/os_daemon_configer.escript.in
new file mode 100755
index 0000000..d2ecfa8
--- /dev/null
+++ b/test/couchdb/fixtures/os_daemon_configer.escript.in
@@ -0,0 +1,84 @@
+#! /usr/bin/env escript
+%% -*- erlang -*-
+%%! -DTEST -pa @abs_top_builddir@/src/ejson
+%%
+%% 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.
+
+read() ->
+ case io:get_line('') of
+ eof ->
+ stop;
+ Data ->
+ ejson:decode(Data)
+ end.
+
+write(Mesg) ->
+ Data = iolist_to_binary(ejson:encode(Mesg)),
+ io:format(binary_to_list(Data) ++ "\n", []).
+
+get_cfg(Section) ->
+ write([<<"get">>, Section]),
+ read().
+
+get_cfg(Section, Name) ->
+ write([<<"get">>, Section, Name]),
+ read().
+
+log(Mesg) ->
+ write([<<"log">>, Mesg]).
+
+log(Mesg, Level) ->
+ write([<<"log">>, Mesg, {[{<<"level">>, Level}]}]).
+
+test_get_cfg1() ->
+ Path = list_to_binary(?FILE),
+ FileName = list_to_binary(filename:basename(?FILE)),
+ {[{FileName, Path}]} = get_cfg(<<"os_daemons">>).
+
+test_get_cfg2() ->
+ Path = list_to_binary(?FILE),
+ FileName = list_to_binary(filename:basename(?FILE)),
+ Path = get_cfg(<<"os_daemons">>, FileName),
+ <<"sequential">> = get_cfg(<<"uuids">>, <<"algorithm">>).
+
+
+test_get_unknown_cfg() ->
+ {[]} = get_cfg(<<"aal;3p4">>),
+ null = get_cfg(<<"aal;3p4">>, <<"313234kjhsdfl">>).
+
+test_log() ->
+ log(<<"foobar!">>),
+ log(<<"some stuff!">>, <<"debug">>),
+ log(2),
+ log(true),
+ write([<<"log">>, <<"stuff">>, 2]),
+ write([<<"log">>, 3, null]),
+ write([<<"log">>, [1, 2], {[{<<"level">>, <<"debug">>}]}]),
+ write([<<"log">>, <<"true">>, {[]}]).
+
+do_tests() ->
+ test_get_cfg1(),
+ test_get_cfg2(),
+ test_get_unknown_cfg(),
+ test_log(),
+ loop(io:read("")).
+
+loop({ok, _}) ->
+ loop(io:read(""));
+loop(eof) ->
+ init:stop();
+loop({error, _Reason}) ->
+ init:stop().
+
+main([]) ->
+ do_tests().
[2/9] couchdb commit: updated refs/heads/1963-eunit to 2e3e693
Posted by kx...@apache.org.
Fix tests temp directory path
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/8655956d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/8655956d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/8655956d
Branch: refs/heads/1963-eunit
Commit: 8655956d47f5945977391d7f2fa4d373f3f41266
Parents: 5869b7a
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Jun 23 00:21:42 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Jun 23 03:31:25 2014 +0400
----------------------------------------------------------------------
test/couchdb/couch_eunit.hrl.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/8655956d/test/couchdb/couch_eunit.hrl.in
----------------------------------------------------------------------
diff --git a/test/couchdb/couch_eunit.hrl.in b/test/couchdb/couch_eunit.hrl.in
index 4eb750b..ff080e1 100644
--- a/test/couchdb/couch_eunit.hrl.in
+++ b/test/couchdb/couch_eunit.hrl.in
@@ -21,7 +21,7 @@
-define(FIXTURESDIR,
filename:join([?SOURCEDIR, "test", "couchdb", "fixtures"])).
-define(TEMPDIR,
- filename:join([?SOURCEDIR, "test", "couchdb", "temp"])).
+ filename:join([?BUILDDIR, "test", "couchdb", "temp"])).
-define(tempfile,
fun() ->
[8/9] couchdb commit: updated refs/heads/1963-eunit to 2e3e693
Posted by kx...@apache.org.
More etap cleanup
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/947261d4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/947261d4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/947261d4
Branch: refs/heads/1963-eunit
Commit: 947261d4acb7f1a3ee51e968268afeb51e6a8245
Parents: 73c3312
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Jun 23 00:28:58 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Jun 23 15:55:44 2014 +0400
----------------------------------------------------------------------
license.skip | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/947261d4/license.skip
----------------------------------------------------------------------
diff --git a/license.skip b/license.skip
index f09c6d6..c6b9add 100644
--- a/license.skip
+++ b/license.skip
@@ -178,14 +178,6 @@
^test/couchdb/fixtures/.deps/test_cfg_register-test_cfg_register.Po
^test/couchdb/fixtures/test_cfg_register
^test/couchdb/fixtures/test_cfg_register.o
-^test/etap/.*.beam
-^test/etap/.*.o
-^test/etap/.deps/.*
-^test/etap/test_cfg_register
-^test/etap/Makefile
-^test/etap/Makefile.in
-^test/etap/temp..*
-^test/etap/fixtures/*
^test/javascript/Makefile
^test/javascript/Makefile.in
^test/local.ini
[5/9] couchdb commit: updated refs/heads/1963-eunit to 2e3e693
Posted by kx...@apache.org.
Handle test_cfg_register daemon path in special way
During make distcheck test_cfg_register binary become separated from
others fixtures and becomes available by ?BUILDDIR path, not ?SOURCEDIR
as others are.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/62f05601
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/62f05601
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/62f05601
Branch: refs/heads/1963-eunit
Commit: 62f05601594c12c277dd50218e749b6bc79b8258
Parents: b8138be
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Jun 23 00:20:29 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Jun 23 03:31:26 2014 +0400
----------------------------------------------------------------------
test/couchdb/couchdb_os_daemons_tests.erl | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/62f05601/test/couchdb/couchdb_os_daemons_tests.erl
----------------------------------------------------------------------
diff --git a/test/couchdb/couchdb_os_daemons_tests.erl b/test/couchdb/couchdb_os_daemons_tests.erl
index e988548..1058a78 100644
--- a/test/couchdb/couchdb_os_daemons_tests.erl
+++ b/test/couchdb/couchdb_os_daemons_tests.erl
@@ -40,8 +40,13 @@
setup(DName) ->
{ok, CfgPid} = couch_config:start_link(?CONFIG_CHAIN),
{ok, OsDPid} = couch_os_daemons:start_link(),
- couch_config:set("os_daemons", DName,
- filename:join([?FIXTURESDIR, DName]), false),
+ Path = case DName of
+ ?DAEMON_CFGREG ->
+ filename:join([?BUILDDIR, "test", "couchdb", "fixtures", DName]);
+ _ ->
+ filename:join([?FIXTURESDIR, DName])
+ end,
+ couch_config:set("os_daemons", DName, Path, false),
timer:sleep(?DELAY), % sleep a bit to let daemon set kill flag
{CfgPid, OsDPid}.
[3/9] couchdb commit: updated refs/heads/1963-eunit to 2e3e693
Posted by kx...@apache.org.
Move couch_eunit.hrl.in to include directory
Because include path "." has higher priority than any other custom
paths, generated during `configure` phase couch_eunit.hrl contains
build and source paths which aren't used for `make distcheck` causing
various failures.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/033b1f1d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/033b1f1d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/033b1f1d
Branch: refs/heads/1963-eunit
Commit: 033b1f1dfa5d74813e63db36fede3aa120095438
Parents: 1330c2e
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Jun 23 00:33:26 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Jun 23 03:31:26 2014 +0400
----------------------------------------------------------------------
.gitignore | 2 +-
configure.ac | 2 +-
test/couchdb/Makefile.am | 5 ++--
test/couchdb/couch_eunit.hrl.in | 44 ----------------------------
test/couchdb/include/couch_eunit.hrl.in | 44 ++++++++++++++++++++++++++++
test/couchdb/run.in | 7 +++--
6 files changed, 53 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/033b1f1d/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0f8498c..236aa5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,7 +129,7 @@ stamp-h1
test/.deps/
test/bench/run
test/couchdb/run
-test/couchdb/couch_eunit.hrl
+test/couchdb/include/couch_eunit.hrl
test/couchdb/fixtures/.deps/
test/javascript/run
test/javascript/run_js_tests.sh
http://git-wip-us.apache.org/repos/asf/couchdb/blob/033b1f1d/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 36b765a..5aba06a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -754,7 +754,7 @@ AC_CONFIG_FILES([test/Makefile])
AC_CONFIG_FILES([test/bench/Makefile])
AC_CONFIG_FILES([test/couchdb/run])
AC_CONFIG_FILES([test/couchdb/Makefile])
-AC_CONFIG_FILES([test/couchdb/couch_eunit.hrl])
+AC_CONFIG_FILES([test/couchdb/include/couch_eunit.hrl])
AC_CONFIG_FILES([test/couchdb/fixtures/Makefile])
AC_CONFIG_FILES([test/javascript/Makefile])
AC_CONFIG_FILES([test/view_server/Makefile])
http://git-wip-us.apache.org/repos/asf/couchdb/blob/033b1f1d/test/couchdb/Makefile.am
----------------------------------------------------------------------
diff --git a/test/couchdb/Makefile.am b/test/couchdb/Makefile.am
index b51bdb1..2de2a90 100644
--- a/test/couchdb/Makefile.am
+++ b/test/couchdb/Makefile.am
@@ -17,7 +17,8 @@ noinst_SCRIPTS = run
all:
mkdir -p ebin
mkdir -p temp
- ${ERLC} -oebin test_request.erl test_web.erl
+ ${ERLC} -Wall -I$(top_srcdir)/src -I$(top_srcdir)/test/couchdb/include \
+ -o ebin/ test_request.erl test_web.erl
chmod +x run
chmod +x fixtures/*.sh
chmod -x fixtures/os_daemon_bad_perm.sh
@@ -54,7 +55,7 @@ eunit_files = \
json_stream_parse_tests.erl \
test_request.erl \
test_web.erl \
- couch_eunit.hrl
+ include/couch_eunit.hrl
fixture_files = \
fixtures/couch_config_tests_1.ini \
http://git-wip-us.apache.org/repos/asf/couchdb/blob/033b1f1d/test/couchdb/couch_eunit.hrl.in
----------------------------------------------------------------------
diff --git a/test/couchdb/couch_eunit.hrl.in b/test/couchdb/couch_eunit.hrl.in
deleted file mode 100644
index ff080e1..0000000
--- a/test/couchdb/couch_eunit.hrl.in
+++ /dev/null
@@ -1,44 +0,0 @@
-% 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.
-
--include_lib("eunit/include/eunit.hrl").
-
--define(BUILDDIR, "@abs_top_builddir@").
--define(SOURCEDIR, "@abs_top_srcdir@").
--define(CONFIG_CHAIN, [
- filename:join([?BUILDDIR, "etc", "couchdb", "default_dev.ini"]),
- filename:join([?BUILDDIR, "etc", "couchdb", "local_dev.ini"]),
- filename:join([?SOURCEDIR, "test", "couchdb", "eunit.ini"])]).
--define(FIXTURESDIR,
- filename:join([?SOURCEDIR, "test", "couchdb", "fixtures"])).
--define(TEMPDIR,
- filename:join([?BUILDDIR, "test", "couchdb", "temp"])).
-
--define(tempfile,
- fun() ->
- {A, B, C} = erlang:now(),
- N = node(),
- FileName = lists:flatten(io_lib:format("~p-~p.~p.~p", [N, A, B, C])),
- filename:join([?TEMPDIR, FileName])
- end).
--define(tempdb,
- fun() ->
- Nums = tuple_to_list(erlang:now()),
- Prefix = "eunit-test-db",
- Suffix = lists:concat([integer_to_list(Num) || Num <- Nums]),
- list_to_binary(Prefix ++ "-" ++ Suffix)
- end).
--define(docid,
- fun() ->
- {A, B, C} = erlang:now(),
- lists:flatten(io_lib:format("~p~p~p", [A, B, C]))
- end).
http://git-wip-us.apache.org/repos/asf/couchdb/blob/033b1f1d/test/couchdb/include/couch_eunit.hrl.in
----------------------------------------------------------------------
diff --git a/test/couchdb/include/couch_eunit.hrl.in b/test/couchdb/include/couch_eunit.hrl.in
new file mode 100644
index 0000000..ff080e1
--- /dev/null
+++ b/test/couchdb/include/couch_eunit.hrl.in
@@ -0,0 +1,44 @@
+% 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.
+
+-include_lib("eunit/include/eunit.hrl").
+
+-define(BUILDDIR, "@abs_top_builddir@").
+-define(SOURCEDIR, "@abs_top_srcdir@").
+-define(CONFIG_CHAIN, [
+ filename:join([?BUILDDIR, "etc", "couchdb", "default_dev.ini"]),
+ filename:join([?BUILDDIR, "etc", "couchdb", "local_dev.ini"]),
+ filename:join([?SOURCEDIR, "test", "couchdb", "eunit.ini"])]).
+-define(FIXTURESDIR,
+ filename:join([?SOURCEDIR, "test", "couchdb", "fixtures"])).
+-define(TEMPDIR,
+ filename:join([?BUILDDIR, "test", "couchdb", "temp"])).
+
+-define(tempfile,
+ fun() ->
+ {A, B, C} = erlang:now(),
+ N = node(),
+ FileName = lists:flatten(io_lib:format("~p-~p.~p.~p", [N, A, B, C])),
+ filename:join([?TEMPDIR, FileName])
+ end).
+-define(tempdb,
+ fun() ->
+ Nums = tuple_to_list(erlang:now()),
+ Prefix = "eunit-test-db",
+ Suffix = lists:concat([integer_to_list(Num) || Num <- Nums]),
+ list_to_binary(Prefix ++ "-" ++ Suffix)
+ end).
+-define(docid,
+ fun() ->
+ {A, B, C} = erlang:now(),
+ lists:flatten(io_lib:format("~p~p~p", [A, B, C]))
+ end).
http://git-wip-us.apache.org/repos/asf/couchdb/blob/033b1f1d/test/couchdb/run.in
----------------------------------------------------------------------
diff --git a/test/couchdb/run.in b/test/couchdb/run.in
index 2982ec3..2405f63 100644
--- a/test/couchdb/run.in
+++ b/test/couchdb/run.in
@@ -16,8 +16,8 @@
-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"])).
+-define(TESTS_EBIN, filename:join([?BUILDDIR, "test", "couchdb", "ebin", ""])).
+-define(TESTS_TEMP, filename:join([?BUILDDIR, "test", "couchdb", "temp", ""])).
main([]) ->
io:fwrite("Path to test file or directory wasn't specified.~n"),
@@ -79,7 +79,8 @@ compile(Files) ->
fun(File)->
io:fwrite("compile ~p~n", [File]),
Opts = [report, verbose, {outdir, ?TESTS_EBIN},
- {i, filename:join([?BUILDDIR, "test", "couchdb"])},
+ {i, filename:join([?BUILDDIR, "test", "couchdb",
+ "include"])},
{i, filename:join([?SOURCEDIR, "src"])}],
{ok, Mod} = compile:file(File, Opts),
Mod
[9/9] couchdb commit: updated refs/heads/1963-eunit to 2e3e693
Posted by kx...@apache.org.
Fix Makefile rules for `make distcheck`
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/2e3e6936
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/2e3e6936
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/2e3e6936
Branch: refs/heads/1963-eunit
Commit: 2e3e693666e557e89c5869ba2ee4614bd394ad71
Parents: 947261d
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Jun 23 00:40:56 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Jun 23 15:55:52 2014 +0400
----------------------------------------------------------------------
test/couchdb/Makefile.am | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/2e3e6936/test/couchdb/Makefile.am
----------------------------------------------------------------------
diff --git a/test/couchdb/Makefile.am b/test/couchdb/Makefile.am
index 2de2a90..fcc8d19 100644
--- a/test/couchdb/Makefile.am
+++ b/test/couchdb/Makefile.am
@@ -14,15 +14,6 @@ SUBDIRS = fixtures
noinst_SCRIPTS = run
-all:
- mkdir -p ebin
- mkdir -p temp
- ${ERLC} -Wall -I$(top_srcdir)/src -I$(top_srcdir)/test/couchdb/include \
- -o ebin/ test_request.erl test_web.erl
- chmod +x run
- chmod +x fixtures/*.sh
- chmod -x fixtures/os_daemon_bad_perm.sh
-
eunit_files = \
couch_auth_cache_tests.erl \
couch_btree_tests.erl \
@@ -78,6 +69,15 @@ EXTRA_DIST = \
$(eunit_files) \
$(fixture_files)
+all:
+ @mkdir -p ebin/
+ @mkdir -p temp/
+ $(ERLC) -Wall -I$(top_srcdir)/src -I$(top_srcdir)/test/couchdb/include \
+ -o $(top_builddir)/test/couchdb/ebin/ $(ERLC_FLAGS) ${TEST} \
+ $(top_srcdir)/test/couchdb/test_request.erl \
+ $(top_srcdir)/test/couchdb/test_web.erl
+ chmod +x run
+
clean-local:
- rm -rf ebin
- rm -rf temp
+ rm -rf ebin/
+ rm -rf temp/