You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2009/11/09 01:39:19 UTC
svn commit: r833951 - in /couchdb/trunk: ./ bin/ etc/couchdb/ share/
src/couchdb/priv/ src/erlang-oauth/ src/ibrowse/ src/mochiweb/ test/
test/etap/ test/javascript/ test/view_server/ utils/
Author: davisp
Date: Mon Nov 9 00:39:16 2009
New Revision: 833951
URL: http://svn.apache.org/viewvc?rev=833951&view=rev
Log:
Fixes 'make distcheck' to run the test suite.
Quite a few changes to the build system to handle VPATH builds appropriately as well as make the test suite know about them.
Added:
couchdb/trunk/src/couchdb/priv/stat_descriptions.cfg.in
- copied unchanged from r833935, couchdb/trunk/src/couchdb/priv/stat_descriptions.cfg
couchdb/trunk/src/erlang-oauth/oauth.app.in
- copied unchanged from r833935, couchdb/trunk/src/erlang-oauth/oauth.app
couchdb/trunk/src/ibrowse/ibrowse.app.in
- copied unchanged from r833935, couchdb/trunk/src/ibrowse/ibrowse.app
couchdb/trunk/src/mochiweb/mochiweb.app.in
- copied unchanged from r833935, couchdb/trunk/src/mochiweb/mochiweb.app
couchdb/trunk/test/etap/Makefile.am
couchdb/trunk/test/etap/run.tpl
couchdb/trunk/test/etap/test_util.erl.in
couchdb/trunk/test/javascript/ (with props)
couchdb/trunk/test/javascript/Makefile.am
couchdb/trunk/test/javascript/runner.sh
- copied unchanged from r833935, couchdb/trunk/test/runner.sh
couchdb/trunk/test/javascript/test.js
- copied unchanged from r833935, couchdb/trunk/test/test.js
couchdb/trunk/test/view_server/ (with props)
couchdb/trunk/test/view_server/Makefile.am
couchdb/trunk/test/view_server/query_server_spec.rb
- copied unchanged from r833935, couchdb/trunk/test/query_server_spec.rb
couchdb/trunk/test/view_server/run_native_process.es
- copied unchanged from r833935, couchdb/trunk/test/run_native_process.es
Removed:
couchdb/trunk/src/couchdb/priv/stat_descriptions.cfg
couchdb/trunk/src/erlang-oauth/oauth.app
couchdb/trunk/src/ibrowse/ibrowse.app
couchdb/trunk/src/mochiweb/mochiweb.app
couchdb/trunk/test/query_server_spec.rb
couchdb/trunk/test/run_native_process.es
couchdb/trunk/test/runner.sh
couchdb/trunk/test/test.js
Modified:
couchdb/trunk/Makefile.am
couchdb/trunk/bin/Makefile.am
couchdb/trunk/configure.ac
couchdb/trunk/etc/couchdb/Makefile.am
couchdb/trunk/etc/couchdb/default.ini.tpl.in
couchdb/trunk/license.skip
couchdb/trunk/share/Makefile.am
couchdb/trunk/src/couchdb/priv/Makefile.am
couchdb/trunk/src/erlang-oauth/Makefile.am
couchdb/trunk/src/ibrowse/Makefile.am
couchdb/trunk/src/mochiweb/Makefile.am
couchdb/trunk/test/Makefile.am
couchdb/trunk/test/etap/ (props changed)
couchdb/trunk/test/etap/001-load.t
couchdb/trunk/test/etap/002-erl-driver.t
couchdb/trunk/test/etap/010-file-basics.t
couchdb/trunk/test/etap/011-file-headers.t
couchdb/trunk/test/etap/020-btree-basics.t
couchdb/trunk/test/etap/021-btree-reductions.t
couchdb/trunk/test/etap/030-doc-from-json.t
couchdb/trunk/test/etap/031-doc-to-json.t
couchdb/trunk/test/etap/040-util.t
couchdb/trunk/test/etap/041-uuid-gen.t
couchdb/trunk/test/etap/050-stream.t
couchdb/trunk/test/etap/060-kt-merging.t
couchdb/trunk/test/etap/061-kt-missing-leaves.t
couchdb/trunk/test/etap/062-kt-remove-leaves.t
couchdb/trunk/test/etap/063-kt-get-leaves.t
couchdb/trunk/test/etap/064-kt-counting.t
couchdb/trunk/test/etap/065-kt-stemming.t
couchdb/trunk/test/etap/070-couch-db.t
couchdb/trunk/test/etap/080-config-get-set.t
couchdb/trunk/test/etap/081-config-override.t
couchdb/trunk/test/etap/082-config-register.t
couchdb/trunk/test/etap/083-config-no-files.t
couchdb/trunk/test/etap/090-task-status.t
couchdb/trunk/test/etap/100-ref-counter.t
couchdb/trunk/test/etap/110-replication-httpc.t
couchdb/trunk/test/etap/111-replication-changes-feed.t
couchdb/trunk/test/etap/112-replication-missing-revs.t
couchdb/trunk/test/etap/120-stats-collect.t
couchdb/trunk/test/etap/121-stats-aggregates.t
couchdb/trunk/utils/Makefile.am
Modified: couchdb/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/Makefile.am?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/Makefile.am (original)
+++ couchdb/trunk/Makefile.am Mon Nov 9 00:39:16 2009
@@ -37,7 +37,7 @@
-gzip -9 < $< > $@
check: dev
- prove test/etap/*.t
+ $(top_builddir)/test/etap/run
cover: dev
rm -f cover/*.coverdata
@@ -57,6 +57,9 @@
mkdir -p $(top_builddir)/tmp/log
mkdir -p $(top_builddir)/tmp/run
+distclean-local:
+ rm -fr $(top_builddir)/tmp
+
.PHONY: local-clean
local-clean: maintainer-clean
@echo "This command is intended for maintainers to use;"
@@ -69,7 +72,6 @@
rm -f $(top_srcdir)/test/etap/temp.*
rm -f $(top_srcdir)/*.tar.gz
rm -f $(top_srcdir)/*.tar.gz.*
- rm -fr $(top_srcdir)/tmp
find $(top_srcdir) -name Makefile.in -exec rm {} \;
distcheck-hook:
Modified: couchdb/trunk/bin/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/bin/Makefile.am?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/bin/Makefile.am (original)
+++ couchdb/trunk/bin/Makefile.am Mon Nov 9 00:39:16 2009
@@ -60,7 +60,7 @@
chmod +x $@
couchjs_dev: couchjs.tpl
- sed -e "s|%locallibbindir%|$(abs_top_srcdir)/src/couchdb|g" \
+ sed -e "s|%locallibbindir%|$(abs_top_builddir)/src/couchdb|g" \
-e "s|%bug_uri%|@bug_uri@|g" \
-e "s|%package_author_address%|@package_author_address@|g" \
-e "s|%package_author_name%|@package_author_name@|g" \
Modified: couchdb/trunk/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/configure.ac (original)
+++ couchdb/trunk/configure.ac Mon Nov 9 00:39:16 2009
@@ -403,6 +403,10 @@
AC_CONFIG_FILES([src/ibrowse/Makefile])
AC_CONFIG_FILES([src/mochiweb/Makefile])
AC_CONFIG_FILES([test/Makefile])
+AC_CONFIG_FILES([test/etap/Makefile])
+AC_CONFIG_FILES([test/etap/test_util.erl])
+AC_CONFIG_FILES([test/javascript/Makefile])
+AC_CONFIG_FILES([test/view_server/Makefile])
AC_CONFIG_FILES([utils/Makefile])
AC_CONFIG_FILES([var/Makefile])
Modified: couchdb/trunk/etc/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/Makefile.am?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/etc/couchdb/Makefile.am (original)
+++ couchdb/trunk/etc/couchdb/Makefile.am Mon Nov 9 00:39:16 2009
@@ -11,7 +11,7 @@
## the License.
couchprivlibdir = $(localerlanglibdir)/couch-$(version)/priv/lib
-devcouchprivlibdir = $(abs_top_srcdir)/src/couchdb/.libs
+devcouchprivlibdir = $(abs_top_builddir)/src/couchdb/.libs
localconf_DATA = default.ini
noinst_DATA = default_dev.ini local_dev.ini
@@ -29,6 +29,7 @@
sed -e "s|%bindir%|.|g" \
-e "s|%localconfdir%|$(localconfdir)|g" \
-e "s|%localdatadir%|../share/couchdb|g" \
+ -e "s|%localbuilddatadir%|../share/couchdb|g" \
-e "s|%localstatelibdir%|../var/lib/couchdb|g" \
-e "s|%localstatelogdir%|../var/log/couchdb|g" \
-e "s|%couchprivlibdir%|../lib/couch-$(version)/priv/lib|g" \
@@ -39,6 +40,7 @@
sed -e "s|%bindir%|$(bindir)|g" \
-e "s|%localconfdir%|$(localconfdir)|g" \
-e "s|%localdatadir%|$(localdatadir)|g" \
+ -e "s|%localbuilddatadir%|$(localdatadir)|g" \
-e "s|%localstatelibdir%|$(localstatelibdir)|g" \
-e "s|%localstatelogdir%|$(localstatelogdir)|g" \
-e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
@@ -47,11 +49,12 @@
endif
default_dev.ini: default.ini.tpl
- sed -e "s|%bindir%|$(abs_top_srcdir)/bin|g" \
- -e "s|%localconfdir%|$(abs_top_srcdir)/etc/couchdb|g" \
+ sed -e "s|%bindir%|$(abs_top_builddir)/bin|g" \
+ -e "s|%localconfdir%|$(abs_top_builddir)/etc/couchdb|g" \
-e "s|%localdatadir%|$(abs_top_srcdir)/share|g" \
- -e "s|%localstatelibdir%|$(abs_top_srcdir)/tmp/lib|g" \
- -e "s|%localstatelogdir%|$(abs_top_srcdir)/tmp/log|g" \
+ -e "s|%localbuilddatadir%|$(abs_top_builddir)/share|g" \
+ -e "s|%localstatelibdir%|$(abs_top_builddir)/tmp/lib|g" \
+ -e "s|%localstatelogdir%|$(abs_top_builddir)/tmp/log|g" \
-e "s|%couchprivlibdir%|$(devcouchprivlibdir)|g" \
-e "s|%couchjs_command_name%|$(couchjs_dev_command_name)|g" \
< $< > $@
Modified: couchdb/trunk/etc/couchdb/default.ini.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/default.ini.tpl.in?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/etc/couchdb/default.ini.tpl.in (original)
+++ couchdb/trunk/etc/couchdb/default.ini.tpl.in Mon Nov 9 00:39:16 2009
@@ -31,7 +31,7 @@
require_valid_user = false
[query_servers]
-javascript = %bindir%/%couchjs_command_name% %localdatadir%/server/main.js
+javascript = %bindir%/%couchjs_command_name% %localbuilddatadir%/server/main.js
; Changing reduce_limit to false will disable reduce_limit.
; If you think you're hitting reduce_limit with a "good" reduce function,
Modified: couchdb/trunk/license.skip
URL: http://svn.apache.org/viewvc/couchdb/trunk/license.skip?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/license.skip (original)
+++ couchdb/trunk/license.skip Mon Nov 9 00:39:16 2009
@@ -74,6 +74,12 @@
^test/local.ini
^test/Makefile
^test/Makefile.in
+^test/etap/Makefile
+^test/etap/Makefile.in
+^test/javascript/Makefile
+^test/javascript/Makefile.in
+^test/view_server/Makefile
+^test/view_server/Makefile.in
^tmp/*
^THANKS
^utils/Makefile
Modified: couchdb/trunk/share/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/share/Makefile.am (original)
+++ couchdb/trunk/share/Makefile.am Mon Nov 9 00:39:16 2009
@@ -24,6 +24,7 @@
JS_FILE_COMPONENTS_LAST = server/loop.js
$(JS_FILE): $(JS_FILE_COMPONENTS) $(JS_FILE_COMPONENTS_LAST)
+ mkdir -p `dirname $(JS_FILE)`
echo "// DO NOT EDIT THIS FILE BY HAND" > $@
echo >> $@
cat $^ >> $@
Modified: couchdb/trunk/src/couchdb/priv/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/priv/Makefile.am?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/priv/Makefile.am (original)
+++ couchdb/trunk/src/couchdb/priv/Makefile.am Mon Nov 9 00:39:16 2009
@@ -13,11 +13,18 @@
couchlibdir = $(localerlanglibdir)/couch-$(version)
couchprivdir = $(couchlibdir)/priv
-EXTRA_DIST = couchspawnkillable.sh stat_descriptions.cfg
+EXTRA_DIST = \
+ couchspawnkillable.sh \
+ stat_descriptions.cfg.in
+
+CLEANFILES = stat_descriptions.cfg
couchpriv_DATA = stat_descriptions.cfg
couchpriv_PROGRAMS = couchspawnkillable
+%.cfg: %.cfg.in
+ cp $< $@
+
if WINDOWS
couchspawnkillable_SOURCES = couchspawnkillable_win.c
endif
Modified: couchdb/trunk/src/erlang-oauth/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/erlang-oauth/Makefile.am?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/src/erlang-oauth/Makefile.am (original)
+++ couchdb/trunk/src/erlang-oauth/Makefile.am Mon Nov 9 00:39:16 2009
@@ -16,6 +16,7 @@
# we add a ./configure option to enable it.
oauth_file_collection = \
+ oauth.app.in \
oauth.erl \
oauth_hmac_sha1.erl \
oauth_http.erl \
@@ -23,9 +24,8 @@
oauth_unix.erl \
oauth_uri.erl
-oauthebin_static_file = oauth.app
-
oauthebin_make_generated_file_list = \
+ oauth.app \
oauth.beam \
oauth_hmac_sha1.beam \
oauth_http.beam \
@@ -34,15 +34,16 @@
oauth_uri.beam
oauthebin_DATA = \
- $(oauthebin_static_file) \
- $(oauthebin_make_generated_file_list)
+ $(oauthebin_make_generated_file_list)
-EXTRA_DIST = \
- $(oauth_file_collection) \
- $(oauthebin_static_file)
+EXTRA_DIST = \
+ $(oauth_file_collection)
CLEANFILES = \
$(oauthebin_make_generated_file_list)
+%.app: %.app.in
+ cp $< $@
+
%.beam: %.erl
$(ERLC) $(ERLC_FLAGS) $<
Modified: couchdb/trunk/src/ibrowse/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/ibrowse/Makefile.am?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/src/ibrowse/Makefile.am (original)
+++ couchdb/trunk/src/ibrowse/Makefile.am Mon Nov 9 00:39:16 2009
@@ -13,6 +13,7 @@
ibrowseebindir = $(localerlanglibdir)/ibrowse-1.5.2/ebin
ibrowse_file_collection = \
+ ibrowse.app.in \
ibrowse.erl \
ibrowse_app.erl \
ibrowse_http_client.erl \
@@ -21,9 +22,8 @@
ibrowse_sup.erl \
ibrowse_test.erl
-ibrowseebin_static_file = ibrowse.app
-
ibrowseebin_make_generated_file_list = \
+ ibrowse.app \
ibrowse.beam \
ibrowse_app.beam \
ibrowse_http_client.beam \
@@ -33,16 +33,17 @@
ibrowse_test.beam
ibrowseebin_DATA = \
- $(ibrowseebin_static_file) \
$(ibrowseebin_make_generated_file_list)
EXTRA_DIST = \
$(ibrowse_file_collection) \
- $(ibrowseebin_static_file) \
ibrowse.hrl
CLEANFILES = \
$(ibrowseebin_make_generated_file_list)
+%.app: %.app.in
+ cp $< $@
+
%.beam: %.erl
$(ERLC) $(ERLC_FLAGS) $<
Modified: couchdb/trunk/src/mochiweb/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/mochiweb/Makefile.am?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/src/mochiweb/Makefile.am (original)
+++ couchdb/trunk/src/mochiweb/Makefile.am Mon Nov 9 00:39:16 2009
@@ -20,6 +20,7 @@
mochijson.erl \
mochijson2.erl \
mochinum.erl \
+ mochiweb.app.in \
mochiweb.erl \
mochiweb_app.erl \
mochiweb_charref.erl \
@@ -37,8 +38,6 @@
mochiweb_util.erl \
reloader.erl
-mochiwebebin_static_file = mochiweb.app
-
mochiwebebin_make_generated_file_list = \
mochifmt.beam \
mochifmt_records.beam \
@@ -47,6 +46,7 @@
mochijson.beam \
mochijson2.beam \
mochinum.beam \
+ mochiweb.app \
mochiweb.beam \
mochiweb_app.beam \
mochiweb_charref.beam \
@@ -65,15 +65,16 @@
reloader.beam
mochiwebebin_DATA = \
- $(mochiwebebin_static_file) \
$(mochiwebebin_make_generated_file_list)
EXTRA_DIST = \
- $(mochiweb_file_collection) \
- $(mochiwebebin_static_file)
+ $(mochiweb_file_collection)
CLEANFILES = \
$(mochiwebebin_make_generated_file_list)
+%.app: %.app.in
+ cp $< $@
+
%.beam: %.erl
$(ERLC) $(ERLC_FLAGS) $<
Modified: couchdb/trunk/test/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/Makefile.am?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/Makefile.am (original)
+++ couchdb/trunk/test/Makefile.am Mon Nov 9 00:39:16 2009
@@ -10,37 +10,5 @@
## License for the specific language governing permissions and limitations under
## the License.
-dist_TESTS = runner.sh
+SUBDIRS = etap javascript view_server
-EXTRA_DIST = \
- etap/030-doc-from-json.t \
- etap/080-config-get-set.t \
- etap/064-kt-counting.t \
- etap/081-config-override.1.ini \
- etap/100-ref-counter.t \
- etap/083-config-no-files.t \
- etap/070-couch-db.t \
- etap/010-file-basics.t \
- etap/060-kt-merging.t \
- etap/040-util.t \
- etap/110-replication-httpc.t \
- etap/062-kt-remove-leaves.t \
- etap/001-load.t \
- etap/111-replication-changes-feed.t \
- etap/063-kt-get-leaves.t \
- etap/090-task-status.t \
- etap/021-btree-reductions.t \
- etap/081-config-override.2.ini \
- etap/065-kt-stemming.t \
- etap/020-btree-basics.t \
- etap/081-config-override.t \
- etap/082-config-register.t \
- etap/112-replication-missing-revs.t \
- etap/011-file-headers.t \
- etap/061-kt-missing-leaves.t \
- etap/050-stream.t \
- etap/031-doc-to-json.t \
- query_server_spec.rb \
- run_native_process.es \
- runner.sh \
- test.js
Propchange: couchdb/trunk/test/etap/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov 9 00:39:16 2009
@@ -1 +1,4 @@
temp.*
+Makefile
+Makefile.in
+test_util.erl
Modified: couchdb/trunk/test/etap/001-load.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/001-load.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/001-load.t (original)
+++ couchdb/trunk/test/etap/001-load.t Mon Nov 9 00:39:16 2009
@@ -1,6 +1,5 @@
#!/usr/bin/env escript
%% -*- erlang -*-
-%%! -pa src/couchdb -sasl errlog_type error -boot start_sasl -noshell
% 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
@@ -17,8 +16,7 @@
% Test that we can load each module.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(37),
Modules = [
couch_btree,
Modified: couchdb/trunk/test/etap/002-erl-driver.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/002-erl-driver.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/002-erl-driver.t (original)
+++ couchdb/trunk/test/etap/002-erl-driver.t Mon Nov 9 00:39:16 2009
@@ -13,8 +13,7 @@
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(3),
etap:is(
couch_util:start_driver("src/couchdb/.libs"),
Modified: couchdb/trunk/test/etap/010-file-basics.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/010-file-basics.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/010-file-basics.t (original)
+++ couchdb/trunk/test/etap/010-file-basics.t Mon Nov 9 00:39:16 2009
@@ -12,11 +12,10 @@
% License for the specific language governing permissions and limitations under
% the License.
-filename() -> "./test/etap/temp.010".
+filename() -> test_util:build_file("test/etap/temp.010").
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(16),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/011-file-headers.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/011-file-headers.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/011-file-headers.t (original)
+++ couchdb/trunk/test/etap/011-file-headers.t Mon Nov 9 00:39:16 2009
@@ -14,12 +14,11 @@
% License for the specific language governing permissions and limitations under
% the License.
-filename() -> "./test/etap/temp.011".
+filename() -> test_util:build_file("test/etap/temp.011").
sizeblock() -> 4096. % Need to keep this in sync with couch_file.erl
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
{S1, S2, S3} = now(),
random:seed(S1, S2, S3),
Modified: couchdb/trunk/test/etap/020-btree-basics.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/020-btree-basics.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/020-btree-basics.t (original)
+++ couchdb/trunk/test/etap/020-btree-basics.t Mon Nov 9 00:39:16 2009
@@ -14,14 +14,13 @@
% License for the specific language governing permissions and limitations under
% the License.
-filename() -> "./test/etap/temp.020".
+filename() -> test_util:build_file("test/etap/temp.020").
rows() -> 250.
-record(btree, {fd, root, extract_kv, assemble_kv, less, reduce}).
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(48),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/021-btree-reductions.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/021-btree-reductions.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/021-btree-reductions.t (original)
+++ couchdb/trunk/test/etap/021-btree-reductions.t Mon Nov 9 00:39:16 2009
@@ -18,8 +18,7 @@
rows() -> 1000.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(8),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/030-doc-from-json.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/030-doc-from-json.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/030-doc-from-json.t (original)
+++ couchdb/trunk/test/etap/030-doc-from-json.t Mon Nov 9 00:39:16 2009
@@ -20,8 +20,7 @@
-record(att, {name, type, len, md5= <<>>, revpos=0, data}).
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(26),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/031-doc-to-json.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/031-doc-to-json.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/031-doc-to-json.t (original)
+++ couchdb/trunk/test/etap/031-doc-to-json.t Mon Nov 9 00:39:16 2009
@@ -20,8 +20,7 @@
-record(att, {name, type, len, md5= <<>>, revpos=0, data}).
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(12),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/040-util.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/040-util.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/040-util.t (original)
+++ couchdb/trunk/test/etap/040-util.t Mon Nov 9 00:39:16 2009
@@ -14,8 +14,7 @@
% the License.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
application:start(crypto),
etap:plan(11),
Modified: couchdb/trunk/test/etap/041-uuid-gen.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/041-uuid-gen.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/041-uuid-gen.t (original)
+++ couchdb/trunk/test/etap/041-uuid-gen.t Mon Nov 9 00:39:16 2009
@@ -14,13 +14,13 @@
% the License.
default_config() ->
- "etc/couchdb/default_dev.ini".
+ test_util:build_file("etc/couchdb/default_dev.ini").
seq_alg_config() ->
- "test/etap/041-uuid-gen-seq.ini".
+ test_util:source_file("test/etap/041-uuid-gen-seq.ini").
utc_alg_config() ->
- "test/etap/041-uuid-gen-utc.ini".
+ test_util:source_file("test/etap/041-uuid-gen-utc.ini").
% Run tests and wait for the gen_servers to shutdown
run_test(IniFiles, Test) ->
@@ -38,8 +38,7 @@
end.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
application:start(crypto),
etap:plan(6),
Modified: couchdb/trunk/test/etap/050-stream.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/050-stream.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/050-stream.t (original)
+++ couchdb/trunk/test/etap/050-stream.t Mon Nov 9 00:39:16 2009
@@ -14,8 +14,7 @@
% the License.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(13),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/060-kt-merging.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/060-kt-merging.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/060-kt-merging.t (original)
+++ couchdb/trunk/test/etap/060-kt-merging.t Mon Nov 9 00:39:16 2009
@@ -14,8 +14,7 @@
% the License.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(16),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/061-kt-missing-leaves.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/061-kt-missing-leaves.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/061-kt-missing-leaves.t (original)
+++ couchdb/trunk/test/etap/061-kt-missing-leaves.t Mon Nov 9 00:39:16 2009
@@ -14,8 +14,7 @@
% the License.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(4),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/062-kt-remove-leaves.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/062-kt-remove-leaves.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/062-kt-remove-leaves.t (original)
+++ couchdb/trunk/test/etap/062-kt-remove-leaves.t Mon Nov 9 00:39:16 2009
@@ -14,8 +14,7 @@
% the License.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(6),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/063-kt-get-leaves.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/063-kt-get-leaves.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/063-kt-get-leaves.t (original)
+++ couchdb/trunk/test/etap/063-kt-get-leaves.t Mon Nov 9 00:39:16 2009
@@ -14,8 +14,7 @@
% the License.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(11),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/064-kt-counting.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/064-kt-counting.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/064-kt-counting.t (original)
+++ couchdb/trunk/test/etap/064-kt-counting.t Mon Nov 9 00:39:16 2009
@@ -14,8 +14,7 @@
% the License.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(4),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/065-kt-stemming.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/065-kt-stemming.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/065-kt-stemming.t (original)
+++ couchdb/trunk/test/etap/065-kt-stemming.t Mon Nov 9 00:39:16 2009
@@ -14,8 +14,7 @@
% the License.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(3),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/070-couch-db.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/070-couch-db.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/070-couch-db.t (original)
+++ couchdb/trunk/test/etap/070-couch-db.t Mon Nov 9 00:39:16 2009
@@ -14,9 +14,7 @@
% the License.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
- code:add_pathz("src/mochiweb"),
+ test_util:init_code_path(),
etap:plan(4),
case (catch test()) of
Modified: couchdb/trunk/test/etap/080-config-get-set.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/080-config-get-set.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/080-config-get-set.t (original)
+++ couchdb/trunk/test/etap/080-config-get-set.t Mon Nov 9 00:39:16 2009
@@ -14,11 +14,10 @@
% the License.
default_config() ->
- "etc/couchdb/default_dev.ini".
+ test_util:build_file("etc/couchdb/default_dev.ini").
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(12),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/081-config-override.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/081-config-override.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/081-config-override.t (original)
+++ couchdb/trunk/test/etap/081-config-override.t Mon Nov 9 00:39:16 2009
@@ -14,16 +14,16 @@
% the License.
default_config() ->
- "etc/couchdb/default_dev.ini".
+ test_util:build_file("etc/couchdb/default_dev.ini").
local_config_1() ->
- "test/etap/081-config-override.1.ini".
+ test_util:source_file("test/etap/081-config-override.1.ini").
local_config_2() ->
- "test/etap/081-config-override.2.ini".
+ test_util:source_file("test/etap/081-config-override.2.ini").
local_config_write() ->
- "test/etap/temp.081".
+ test_util:build_file("test/etap/temp.081").
% Run tests and wait for the config gen_server to shutdown.
run_tests(IniFiles, Tests) ->
@@ -39,8 +39,7 @@
end.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(17),
case (catch test()) of
Modified: couchdb/trunk/test/etap/082-config-register.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/082-config-register.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/082-config-register.t (original)
+++ couchdb/trunk/test/etap/082-config-register.t Mon Nov 9 00:39:16 2009
@@ -14,11 +14,10 @@
% the License.
default_config() ->
- "etc/couchdb/default_dev.ini".
+ test_util:build_file("etc/couchdb/default_dev.ini").
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(5),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/083-config-no-files.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/083-config-no-files.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/083-config-no-files.t (original)
+++ couchdb/trunk/test/etap/083-config-no-files.t Mon Nov 9 00:39:16 2009
@@ -14,11 +14,10 @@
% the License.
default_config() ->
- "etc/couchdb/default_dev.ini".
+ test_util:build_file("etc/couchdb/default_dev.ini").
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(3),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/090-task-status.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/090-task-status.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/090-task-status.t (original)
+++ couchdb/trunk/test/etap/090-task-status.t Mon Nov 9 00:39:16 2009
@@ -14,8 +14,7 @@
% the License.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(16),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/100-ref-counter.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/100-ref-counter.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/100-ref-counter.t (original)
+++ couchdb/trunk/test/etap/100-ref-counter.t Mon Nov 9 00:39:16 2009
@@ -14,8 +14,7 @@
% the License.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(8),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/110-replication-httpc.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/110-replication-httpc.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/110-replication-httpc.t (original)
+++ couchdb/trunk/test/etap/110-replication-httpc.t Mon Nov 9 00:39:16 2009
@@ -38,12 +38,14 @@
server() -> "http://127.0.0.1:5984/".
dbname() -> "etap-test-db".
+config_files() ->
+ lists:map(fun test_util:build_file/1, [
+ "etc/couchdb/default_dev.ini",
+ "etc/couchdb/local_dev.ini"
+ ]).
+
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
- code:add_pathz("src/ibrowse"),
- code:add_pathz("src/mochiweb"),
- code:add_pathz("src/erlang-oauth"),
+ test_util:init_code_path(),
etap:plan(6),
case (catch test()) of
@@ -56,9 +58,7 @@
ok.
test() ->
- couch_server_sup:start_link(
- ["etc/couchdb/default_dev.ini", "etc/couchdb/local_dev.ini"]
- ),
+ couch_server_sup:start_link(config_files()),
ibrowse:start(),
crypto:start(),
Modified: couchdb/trunk/test/etap/111-replication-changes-feed.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/111-replication-changes-feed.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/111-replication-changes-feed.t (original)
+++ couchdb/trunk/test/etap/111-replication-changes-feed.t Mon Nov 9 00:39:16 2009
@@ -37,12 +37,15 @@
pause = 1,
conn = nil
}).
+
+config_files() ->
+ lists:map(fun test_util:build_file/1, [
+ "etc/couchdb/default_dev.ini",
+ "etc/couchdb/local_dev.ini"
+ ]).
+
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
- code:add_pathz("src/ibrowse"),
- code:add_pathz("src/mochiweb"),
- code:add_pathz("src/erlang-oauth"),
+ test_util:init_code_path(),
etap:plan(13),
case (catch test()) of
@@ -55,9 +58,7 @@
ok.
test() ->
- couch_server_sup:start_link(
- ["etc/couchdb/default_dev.ini", "etc/couchdb/local_dev.ini"]
- ),
+ couch_server_sup:start_link(config_files()),
ibrowse:start(),
crypto:start(),
Modified: couchdb/trunk/test/etap/112-replication-missing-revs.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/112-replication-missing-revs.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/112-replication-missing-revs.t (original)
+++ couchdb/trunk/test/etap/112-replication-missing-revs.t Mon Nov 9 00:39:16 2009
@@ -39,12 +39,14 @@
conn = nil
}).
+config_files() ->
+ lists:map(fun test_util:build_file/1, [
+ "etc/couchdb/default_dev.ini",
+ "etc/couchdb/local_dev.ini"
+ ]).
+
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
- code:add_pathz("src/ibrowse"),
- code:add_pathz("src/mochiweb"),
- code:add_pathz("src/erlang-oauth"),
+ test_util:init_code_path(),
etap:plan(12),
case (catch test()) of
@@ -57,9 +59,7 @@
ok.
test() ->
- couch_server_sup:start_link(
- ["etc/couchdb/default_dev.ini", "etc/couchdb/local_dev.ini"]
- ),
+ couch_server_sup:start_link(config_files()),
ibrowse:start(),
crypto:start(),
Modified: couchdb/trunk/test/etap/120-stats-collect.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/120-stats-collect.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/120-stats-collect.t (original)
+++ couchdb/trunk/test/etap/120-stats-collect.t Mon Nov 9 00:39:16 2009
@@ -14,8 +14,7 @@
% the License.
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(11),
case (catch test()) of
ok ->
Modified: couchdb/trunk/test/etap/121-stats-aggregates.t
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/121-stats-aggregates.t?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/test/etap/121-stats-aggregates.t (original)
+++ couchdb/trunk/test/etap/121-stats-aggregates.t Mon Nov 9 00:39:16 2009
@@ -13,9 +13,14 @@
% License for the specific language governing permissions and limitations under
% the License.
+ini_file() ->
+ test_util:source_file("test/etap/121-stats-aggregates.ini").
+
+cfg_file() ->
+ test_util:source_file("test/etap/121-stats-aggregates.cfg").
+
main(_) ->
- code:add_patha("src/etap"),
- code:add_pathz("src/couchdb"),
+ test_util:init_code_path(),
etap:plan(17),
case (catch test()) of
ok ->
@@ -27,9 +32,9 @@
ok.
test() ->
- couch_config:start_link(["test/etap/121-stats-aggregates.ini"]),
+ couch_config:start_link([ini_file()]),
couch_stats_collector:start(),
- couch_stats_aggregator:start("test/etap/121-stats-aggregates.cfg"),
+ couch_stats_aggregator:start(cfg_file()),
ok = test_all_empty(),
ok = test_get_empty(),
ok = test_count_stats(),
Added: couchdb/trunk/test/etap/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/Makefile.am?rev=833951&view=auto
==============================================================================
--- couchdb/trunk/test/etap/Makefile.am (added)
+++ couchdb/trunk/test/etap/Makefile.am Mon Nov 9 00:39:16 2009
@@ -0,0 +1,64 @@
+## 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.
+
+check_SCRIPTS = run
+noinst_DATA = test_util.beam
+
+%.beam: %.erl
+ erlc $<
+
+run: run.tpl
+ sed -e "s|%abs_top_srcdir%|@abs_top_srcdir@|g" \
+ -e "s|%abs_top_builddir%|@abs_top_builddir@|g" > \
+ $@ < $<
+ chmod +x $@
+
+CLEANFILES = run *.beam
+DISTCLEANFILES = temp.*
+
+EXTRA_DIST = \
+ run.tpl \
+ 001-load.t \
+ 002-erl-driver.t \
+ 010-file-basics.t \
+ 011-file-headers.t \
+ 020-btree-basics.t \
+ 021-btree-reductions.t \
+ 030-doc-from-json.t \
+ 031-doc-to-json.t \
+ 040-util.t \
+ 041-uuid-gen-seq.ini \
+ 041-uuid-gen-utc.ini \
+ 041-uuid-gen.t \
+ 050-stream.t \
+ 060-kt-merging.t \
+ 061-kt-missing-leaves.t \
+ 062-kt-remove-leaves.t \
+ 063-kt-get-leaves.t \
+ 064-kt-counting.t \
+ 065-kt-stemming.t \
+ 070-couch-db.t \
+ 080-config-get-set.t \
+ 081-config-override.1.ini \
+ 081-config-override.2.ini \
+ 081-config-override.t \
+ 082-config-register.t \
+ 083-config-no-files.t \
+ 090-task-status.t \
+ 100-ref-counter.t \
+ 110-replication-httpc.t \
+ 111-replication-changes-feed.t \
+ 112-replication-missing-revs.t \
+ 120-stats-collect.t \
+ 121-stats-aggregates.cfg \
+ 121-stats-aggregates.ini \
+ 121-stats-aggregates.t
Added: couchdb/trunk/test/etap/run.tpl
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/run.tpl?rev=833951&view=auto
==============================================================================
--- couchdb/trunk/test/etap/run.tpl (added)
+++ couchdb/trunk/test/etap/run.tpl Mon Nov 9 00:39:16 2009
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+
+# 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.
+
+SRCDIR="%abs_top_srcdir%"
+BUILDIR="%abs_top_builddir%"
+
+export ERL_FLAGS="$ERL_FLAGS -pa $BUILDIR/test/etap/"
+
+if test $# -gt 0; then
+ while [ $# -gt 0 ]; do
+ $1
+ shift
+ done
+else
+ prove $SRCDIR/test/etap/*.t
+fi
Added: couchdb/trunk/test/etap/test_util.erl.in
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/etap/test_util.erl.in?rev=833951&view=auto
==============================================================================
--- couchdb/trunk/test/etap/test_util.erl.in (added)
+++ couchdb/trunk/test/etap/test_util.erl.in Mon Nov 9 00:39:16 2009
@@ -0,0 +1,35 @@
+% 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.
+
+-module(test_util).
+
+-export([init_code_path/0]).
+-export([source_file/1, build_file/1]).
+
+srcdir() ->
+ "@abs_top_srcdir@".
+
+builddir() ->
+ "@abs_top_builddir@".
+
+init_code_path() ->
+ Paths = ["etap", "couchdb", "erlang-oauth", "ibrowse", "mochiweb"],
+ lists:foreach(fun(Name) ->
+ code:add_pathz(filename:join([builddir(), "src", Name]))
+ end, Paths).
+
+source_file(Name) ->
+ filename:join([srcdir(), Name]).
+
+build_file(Name) ->
+ filename:join([builddir(), Name]).
+
Propchange: couchdb/trunk/test/javascript/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 9 00:39:16 2009
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Added: couchdb/trunk/test/javascript/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/javascript/Makefile.am?rev=833951&view=auto
==============================================================================
--- couchdb/trunk/test/javascript/Makefile.am (added)
+++ couchdb/trunk/test/javascript/Makefile.am Mon Nov 9 00:39:16 2009
@@ -0,0 +1,15 @@
+## 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.
+
+EXTRA_DIST = \
+ runner.sh \
+ test.js
Propchange: couchdb/trunk/test/view_server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 9 00:39:16 2009
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Added: couchdb/trunk/test/view_server/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/test/view_server/Makefile.am?rev=833951&view=auto
==============================================================================
--- couchdb/trunk/test/view_server/Makefile.am (added)
+++ couchdb/trunk/test/view_server/Makefile.am Mon Nov 9 00:39:16 2009
@@ -0,0 +1,15 @@
+## 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.
+
+EXTRA_DIST = \
+ query_server_spec.rb \
+ run_native_process.es
Modified: couchdb/trunk/utils/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/utils/Makefile.am?rev=833951&r1=833950&r2=833951&view=diff
==============================================================================
--- couchdb/trunk/utils/Makefile.am (original)
+++ couchdb/trunk/utils/Makefile.am Mon Nov 9 00:39:16 2009
@@ -20,17 +20,18 @@
run: ../bin/couchdb.tpl
sed -e "s|%ERL%|$(ERL)|g" \
-e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \
- -e "s|%bindir%|$(abs_top_srcdir)/bin|g" \
+ -e "s|%bindir%|$(abs_top_builddir)/bin|g" \
-e "s|%defaultini%|default_dev.ini|g" \
-e "s|%localini%|local_dev.ini|g" \
- -e "s|%localerlanglibdir%|foo -pa $(abs_top_srcdir)\/src\/couchdb \
- -pa $(abs_top_srcdir)\/src\/erlang-oauth \
- -pa $(abs_top_srcdir)\/src\/ibrowse \
- -pa $(abs_top_srcdir)\/src\/mochiweb|g" \
- -e "s|%localconfdir%|$(abs_top_srcdir)/etc/couchdb|g" \
- -e "s|%localstatelogdir%|$(abs_top_srcdir)/tmp/log|g" \
- -e "s|%localstatelibdir%|$(abs_top_srcdir)/tmp/lib|g" \
- -e "s|%localstatedir%|$(abs_top_srcdir)/tmp|g" \
+ -e "s|%localerlanglibdir%|foo \
+ -pa $(abs_top_builddir)\/src\/couchdb \
+ -pa $(abs_top_builddir)\/src\/erlang-oauth \
+ -pa $(abs_top_builddir)\/src\/ibrowse \
+ -pa $(abs_top_builddir)\/src\/mochiweb|g" \
+ -e "s|%localconfdir%|$(abs_top_builddir)/etc/couchdb|g" \
+ -e "s|%localstatelogdir%|$(abs_top_builddir)/tmp/log|g" \
+ -e "s|%localstatelibdir%|$(abs_top_builddir)/tmp/lib|g" \
+ -e "s|%localstatedir%|$(abs_top_builddir)/tmp|g" \
-e "s|%bug_uri%|@bug_uri@|g" \
-e "s|%package_author_address%|@package_author_address@|g" \
-e "s|%package_author_name%|@package_author_name@|g" \