couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r835211 - in /couchdb/branches/0.10.x: ./ bin/ etc/couchdb/ etc/default/ share/ src/couchdb/priv/ src/erlang-oauth/ src/ibrowse/ src/mochiweb/ test/ test/etap/ utils/
Date Thu, 12 Nov 2009 03:25:47 GMT
Author: davisp
Date: Thu Nov 12 03:25:31 2009
New Revision: 835211

URL: http://svn.apache.org/viewvc?rev=835211&view=rev
Log:
Backporting build system fixes for distcheck.

This is a backport of revisions 833951 through 833957.

For validation I've run make check, make distcheck, make cover, the query server specs for
JavaScript and Erlang, and the Futon tests. If things break, blame Noah Slater.


Added:
    couchdb/branches/0.10.x/src/erlang-oauth/oauth.app.in
      - copied unchanged from r833951, couchdb/trunk/src/erlang-oauth/oauth.app.in
    couchdb/branches/0.10.x/src/ibrowse/ibrowse.app.in
      - copied unchanged from r833951, couchdb/trunk/src/ibrowse/ibrowse.app.in
    couchdb/branches/0.10.x/src/mochiweb/mochiweb.app.in
      - copied unchanged from r833951, couchdb/trunk/src/mochiweb/mochiweb.app.in
    couchdb/branches/0.10.x/test/etap/Makefile.am
      - copied, changed from r833951, couchdb/trunk/test/etap/Makefile.am
    couchdb/branches/0.10.x/test/etap/run.tpl
      - copied unchanged from r833951, couchdb/trunk/test/etap/run.tpl
    couchdb/branches/0.10.x/test/etap/test_util.erl.in
      - copied unchanged from r833951, couchdb/trunk/test/etap/test_util.erl.in
    couchdb/branches/0.10.x/test/run_native_process.es
      - copied, changed from r833951, couchdb/trunk/test/view_server/run_native_process.es
    couchdb/branches/0.10.x/test/test.js
      - copied unchanged from r833951, couchdb/trunk/test/javascript/test.js
Removed:
    couchdb/branches/0.10.x/src/erlang-oauth/oauth.app
    couchdb/branches/0.10.x/src/ibrowse/ibrowse.app
    couchdb/branches/0.10.x/src/mochiweb/mochiweb.app
Modified:
    couchdb/branches/0.10.x/   (props changed)
    couchdb/branches/0.10.x/.gitignore
    couchdb/branches/0.10.x/Makefile.am
    couchdb/branches/0.10.x/bin/Makefile.am
    couchdb/branches/0.10.x/configure.ac
    couchdb/branches/0.10.x/etc/couchdb/Makefile.am
    couchdb/branches/0.10.x/etc/couchdb/default.ini.tpl.in
    couchdb/branches/0.10.x/etc/default/couchdb   (props changed)
    couchdb/branches/0.10.x/license.skip
    couchdb/branches/0.10.x/share/Makefile.am
    couchdb/branches/0.10.x/src/couchdb/priv/   (props changed)
    couchdb/branches/0.10.x/src/couchdb/priv/Makefile.am
    couchdb/branches/0.10.x/src/erlang-oauth/   (props changed)
    couchdb/branches/0.10.x/src/erlang-oauth/Makefile.am
    couchdb/branches/0.10.x/src/ibrowse/   (props changed)
    couchdb/branches/0.10.x/src/ibrowse/Makefile.am
    couchdb/branches/0.10.x/src/mochiweb/   (props changed)
    couchdb/branches/0.10.x/src/mochiweb/Makefile.am
    couchdb/branches/0.10.x/test/Makefile.am
    couchdb/branches/0.10.x/test/etap/   (props changed)
    couchdb/branches/0.10.x/test/etap/001-load.t
    couchdb/branches/0.10.x/test/etap/010-file-basics.t
    couchdb/branches/0.10.x/test/etap/011-file-headers.t
    couchdb/branches/0.10.x/test/etap/020-btree-basics.t
    couchdb/branches/0.10.x/test/etap/021-btree-reductions.t
    couchdb/branches/0.10.x/test/etap/030-doc-from-json.t
    couchdb/branches/0.10.x/test/etap/031-doc-to-json.t
    couchdb/branches/0.10.x/test/etap/040-util.t
    couchdb/branches/0.10.x/test/etap/050-stream.t
    couchdb/branches/0.10.x/test/etap/060-kt-merging.t
    couchdb/branches/0.10.x/test/etap/061-kt-missing-leaves.t
    couchdb/branches/0.10.x/test/etap/062-kt-remove-leaves.t
    couchdb/branches/0.10.x/test/etap/063-kt-get-leaves.t
    couchdb/branches/0.10.x/test/etap/064-kt-counting.t
    couchdb/branches/0.10.x/test/etap/065-kt-stemming.t
    couchdb/branches/0.10.x/test/etap/070-couch-db.t
    couchdb/branches/0.10.x/test/etap/080-config-get-set.t
    couchdb/branches/0.10.x/test/etap/081-config-override.t
    couchdb/branches/0.10.x/test/etap/082-config-register.t
    couchdb/branches/0.10.x/test/etap/083-config-no-files.t
    couchdb/branches/0.10.x/test/etap/090-task-status.t
    couchdb/branches/0.10.x/test/etap/100-ref-counter.t
    couchdb/branches/0.10.x/test/etap/110-replication-httpc.t
    couchdb/branches/0.10.x/test/etap/111-replication-changes-feed.t
    couchdb/branches/0.10.x/test/etap/112-replication-missing-revs.t
    couchdb/branches/0.10.x/utils/Makefile.am

Propchange: couchdb/branches/0.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 03:25:31 2009
@@ -4,4 +4,4 @@
 /couchdb/branches/list-iterator:782292-784593
 /couchdb/branches/tail_header:775760-778477
 /couchdb/tags/0.10.0:825400
-/couchdb/trunk:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803,815921,817278,817398,817400,817403,817749,817793,818249,818357,819091,819341,819343,819436,819799,819977,820344,820469,820495,820851,825407,826692,829871,829919-829920,830737,831502
+/couchdb/trunk:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803,815921,817278,817398,817400,817403,817749,817793,818249,818357,819091,819341,819343,819436,819799,819977,820344,820469,820495,820851,825407,826692,829871,829919-829920,830737,831502,833951,833953,833955-833957

Modified: couchdb/branches/0.10.x/.gitignore
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/.gitignore?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/.gitignore (original)
+++ couchdb/branches/0.10.x/.gitignore Thu Nov 12 03:25:31 2009
@@ -57,6 +57,7 @@
 src/couchdb/priv/.deps/
 src/couchdb/priv/couchspawnkillable
 test/local.ini
+test/etap/test_util.erl
 share/server/main.js
 
 # for make dev

Modified: couchdb/branches/0.10.x/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/Makefile.am?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/Makefile.am (original)
+++ couchdb/branches/0.10.x/Makefile.am Thu Nov 12 03:25:31 2009
@@ -37,11 +37,11 @@
 	-gzip -9 < $< > $@
 
 check: dev
-	prove test/etap/*.t
+	$(top_builddir)/test/etap/run
 
 cover: dev
 	rm -f cover/*.coverdata
-	COVER=1 COVER_BIN=./src/couchdb/ prove test/etap/*.t
+	COVER=1 COVER_BIN=./src/couchdb/ $(top_builddir)/test/etap/run
 	SRC=./src/couchdb/ \
 	    $(ERL) -noshell \
 		-pa src/etap \
@@ -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/branches/0.10.x/bin/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/bin/Makefile.am?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/bin/Makefile.am (original)
+++ couchdb/branches/0.10.x/bin/Makefile.am Thu Nov 12 03:25:31 2009
@@ -64,7 +64,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/branches/0.10.x/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/configure.ac?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/configure.ac (original)
+++ couchdb/branches/0.10.x/configure.ac Thu Nov 12 03:25:31 2009
@@ -350,6 +350,8 @@
 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([utils/Makefile])
 AC_CONFIG_FILES([var/Makefile])
 

Modified: couchdb/branches/0.10.x/etc/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/etc/couchdb/Makefile.am?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/etc/couchdb/Makefile.am (original)
+++ couchdb/branches/0.10.x/etc/couchdb/Makefile.am Thu Nov 12 03:25:31 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/branches/0.10.x/etc/couchdb/default.ini.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/etc/couchdb/default.ini.tpl.in?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/etc/couchdb/default.ini.tpl.in (original)
+++ couchdb/branches/0.10.x/etc/couchdb/default.ini.tpl.in Thu Nov 12 03:25:31 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,

Propchange: couchdb/branches/0.10.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 03:25:31 2009
@@ -4,5 +4,5 @@
 /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
 /couchdb/branches/tail_header/etc/default/couchdb:775760-778477
 /couchdb/tags/0.10.0/etc/default/couchdb:825400
-/couchdb/trunk/etc/default/couchdb:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803,815921,817277-817278,817398,817400,817403,817749,817793,818249,818357,819091,819341,819343,819436,819799,819977,820344,820469,820495,820851,825407,826692,829871,829919-829920,830737,831502
+/couchdb/trunk/etc/default/couchdb:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803,815921,817277-817278,817398,817400,817403,817749,817793,818249,818357,819091,819341,819343,819436,819799,819977,820344,820469,820495,820851,825407,826692,829871,829919-829920,830737,831502,833951,833953,833955-833957
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/0.10.x/license.skip
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/license.skip?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/license.skip (original)
+++ couchdb/branches/0.10.x/license.skip Thu Nov 12 03:25:31 2009
@@ -67,9 +67,16 @@
 ^src/mochiweb/*
 ^stamp-h1
 ^test/etap/temp.*
+^test/etap/.*beam
 ^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/branches/0.10.x/share/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/share/Makefile.am?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/share/Makefile.am (original)
+++ couchdb/branches/0.10.x/share/Makefile.am Thu Nov 12 03:25:31 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 $^ >> $@

Propchange: couchdb/branches/0.10.x/src/couchdb/priv/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 12 03:25:31 2009
@@ -2,3 +2,4 @@
 Makefile.in
 Makefile
 couchspawnkillable
+stat_descriptions.cfg

Modified: couchdb/branches/0.10.x/src/couchdb/priv/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/src/couchdb/priv/Makefile.am?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/src/couchdb/priv/Makefile.am (original)
+++ couchdb/branches/0.10.x/src/couchdb/priv/Makefile.am Thu Nov 12 03:25:31 2009
@@ -17,6 +17,9 @@
 
 couchpriv_PROGRAMS = couchspawnkillable
 
+%.cfg: %.cfg.in
+	cp $< $@
+
 if WINDOWS
 couchspawnkillable_SOURCES = couchspawnkillable_win.c
 endif

Propchange: couchdb/branches/0.10.x/src/erlang-oauth/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 12 03:25:31 2009
@@ -1,3 +1,4 @@
+*.app
 *.beam
 Makefile
 Makefile.in

Modified: couchdb/branches/0.10.x/src/erlang-oauth/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/src/erlang-oauth/Makefile.am?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/src/erlang-oauth/Makefile.am (original)
+++ couchdb/branches/0.10.x/src/erlang-oauth/Makefile.am Thu Nov 12 03:25:31 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) $<

Propchange: couchdb/branches/0.10.x/src/ibrowse/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 12 03:25:31 2009
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
 *.beam
+*.app

Modified: couchdb/branches/0.10.x/src/ibrowse/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/src/ibrowse/Makefile.am?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/src/ibrowse/Makefile.am (original)
+++ couchdb/branches/0.10.x/src/ibrowse/Makefile.am Thu Nov 12 03:25:31 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) $<

Propchange: couchdb/branches/0.10.x/src/mochiweb/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 12 03:25:31 2009
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
 *.beam
+*.app

Modified: couchdb/branches/0.10.x/src/mochiweb/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/src/mochiweb/Makefile.am?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/src/mochiweb/Makefile.am (original)
+++ couchdb/branches/0.10.x/src/mochiweb/Makefile.am Thu Nov 12 03:25:31 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/branches/0.10.x/test/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/Makefile.am?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/Makefile.am (original)
+++ couchdb/branches/0.10.x/test/Makefile.am Thu Nov 12 03:25:31 2009
@@ -10,42 +10,5 @@
 ## License for the specific language governing permissions and limitations under
 ## the License.
 
-dist_TESTS = runner.sh
+SUBDIRS = etap
 
-CLEANFILES = runner.beam test.ini
-
-EXTRA_DIST = \
-    couch_config_test.erl \
-    couch_config_writer_test.erl \
-    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.erl \
-    runner.sh \
-    test.js

Propchange: couchdb/branches/0.10.x/test/etap/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 12 03:25:31 2009
@@ -1 +1,6 @@
 temp.*
+Makefile
+Makefile.in
+test_util.erl
+test_util.beam
+run

Modified: couchdb/branches/0.10.x/test/etap/001-load.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/001-load.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/001-load.t (original)
+++ couchdb/branches/0.10.x/test/etap/001-load.t Thu Nov 12 03:25:31 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(39),
     Modules = [
         couch_batch_save,

Modified: couchdb/branches/0.10.x/test/etap/010-file-basics.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/010-file-basics.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/010-file-basics.t (original)
+++ couchdb/branches/0.10.x/test/etap/010-file-basics.t Thu Nov 12 03:25:31 2009
@@ -14,11 +14,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/branches/0.10.x/test/etap/011-file-headers.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/011-file-headers.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/011-file-headers.t (original)
+++ couchdb/branches/0.10.x/test/etap/011-file-headers.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/020-btree-basics.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/020-btree-basics.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/020-btree-basics.t (original)
+++ couchdb/branches/0.10.x/test/etap/020-btree-basics.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/021-btree-reductions.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/021-btree-reductions.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/021-btree-reductions.t (original)
+++ couchdb/branches/0.10.x/test/etap/021-btree-reductions.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/030-doc-from-json.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/030-doc-from-json.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/030-doc-from-json.t (original)
+++ couchdb/branches/0.10.x/test/etap/030-doc-from-json.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/031-doc-to-json.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/031-doc-to-json.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/031-doc-to-json.t (original)
+++ couchdb/branches/0.10.x/test/etap/031-doc-to-json.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/040-util.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/040-util.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/040-util.t (original)
+++ couchdb/branches/0.10.x/test/etap/040-util.t Thu Nov 12 03:25:31 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(12),

Modified: couchdb/branches/0.10.x/test/etap/050-stream.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/050-stream.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/050-stream.t (original)
+++ couchdb/branches/0.10.x/test/etap/050-stream.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/060-kt-merging.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/060-kt-merging.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/060-kt-merging.t (original)
+++ couchdb/branches/0.10.x/test/etap/060-kt-merging.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/061-kt-missing-leaves.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/061-kt-missing-leaves.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/061-kt-missing-leaves.t (original)
+++ couchdb/branches/0.10.x/test/etap/061-kt-missing-leaves.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/062-kt-remove-leaves.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/062-kt-remove-leaves.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/062-kt-remove-leaves.t (original)
+++ couchdb/branches/0.10.x/test/etap/062-kt-remove-leaves.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/063-kt-get-leaves.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/063-kt-get-leaves.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/063-kt-get-leaves.t (original)
+++ couchdb/branches/0.10.x/test/etap/063-kt-get-leaves.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/064-kt-counting.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/064-kt-counting.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/064-kt-counting.t (original)
+++ couchdb/branches/0.10.x/test/etap/064-kt-counting.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/065-kt-stemming.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/065-kt-stemming.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/065-kt-stemming.t (original)
+++ couchdb/branches/0.10.x/test/etap/065-kt-stemming.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/070-couch-db.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/070-couch-db.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/070-couch-db.t (original)
+++ couchdb/branches/0.10.x/test/etap/070-couch-db.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/080-config-get-set.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/080-config-get-set.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/080-config-get-set.t (original)
+++ couchdb/branches/0.10.x/test/etap/080-config-get-set.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/081-config-override.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/081-config-override.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/081-config-override.t (original)
+++ couchdb/branches/0.10.x/test/etap/081-config-override.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/082-config-register.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/082-config-register.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/082-config-register.t (original)
+++ couchdb/branches/0.10.x/test/etap/082-config-register.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/083-config-no-files.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/083-config-no-files.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/083-config-no-files.t (original)
+++ couchdb/branches/0.10.x/test/etap/083-config-no-files.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/090-task-status.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/090-task-status.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/090-task-status.t (original)
+++ couchdb/branches/0.10.x/test/etap/090-task-status.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/100-ref-counter.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/100-ref-counter.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/100-ref-counter.t (original)
+++ couchdb/branches/0.10.x/test/etap/100-ref-counter.t Thu Nov 12 03:25:31 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/branches/0.10.x/test/etap/110-replication-httpc.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/110-replication-httpc.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/110-replication-httpc.t (original)
+++ couchdb/branches/0.10.x/test/etap/110-replication-httpc.t Thu Nov 12 03:25:31 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:start(
-        ["etc/couchdb/default_dev.ini", "etc/couchdb/local_dev.ini"]
-    ),
+    couch_server:start(config_files()),
     ibrowse:start(),
     crypto:start(),
 

Modified: couchdb/branches/0.10.x/test/etap/111-replication-changes-feed.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/111-replication-changes-feed.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/111-replication-changes-feed.t (original)
+++ couchdb/branches/0.10.x/test/etap/111-replication-changes-feed.t Thu Nov 12 03:25:31 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:start(
-        ["etc/couchdb/default_dev.ini", "etc/couchdb/local_dev.ini"]
-    ),
+    couch_server:start(config_files()),
     ibrowse:start(),
     crypto:start(),
 

Modified: couchdb/branches/0.10.x/test/etap/112-replication-missing-revs.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/112-replication-missing-revs.t?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/112-replication-missing-revs.t (original)
+++ couchdb/branches/0.10.x/test/etap/112-replication-missing-revs.t Thu Nov 12 03:25:31 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:start(
-        ["etc/couchdb/default_dev.ini", "etc/couchdb/local_dev.ini"]
-    ),
+    couch_server:start(config_files()),
     ibrowse:start(),
     crypto:start(),
 

Copied: couchdb/branches/0.10.x/test/etap/Makefile.am (from r833951, couchdb/trunk/test/etap/Makefile.am)
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/Makefile.am?p2=couchdb/branches/0.10.x/test/etap/Makefile.am&p1=couchdb/trunk/test/etap/Makefile.am&r1=833951&r2=835211&rev=835211&view=diff
==============================================================================
--- couchdb/trunk/test/etap/Makefile.am (original)
+++ couchdb/branches/0.10.x/test/etap/Makefile.am Thu Nov 12 03:25:31 2009
@@ -10,7 +10,7 @@
 ## License for the specific language governing permissions and limitations under
 ## the License.
 
-check_SCRIPTS = run
+noinst_SCRIPTS = run
 noinst_DATA = test_util.beam
 
 %.beam: %.erl
@@ -28,7 +28,6 @@
 EXTRA_DIST = \
 	run.tpl \
     001-load.t \
-    002-erl-driver.t \
     010-file-basics.t \
     011-file-headers.t \
     020-btree-basics.t \
@@ -36,9 +35,6 @@
     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 \
@@ -57,8 +53,4 @@
     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
+    112-replication-missing-revs.t

Copied: couchdb/branches/0.10.x/test/run_native_process.es (from r833951, couchdb/trunk/test/view_server/run_native_process.es)
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/run_native_process.es?p2=couchdb/branches/0.10.x/test/run_native_process.es&p1=couchdb/trunk/test/view_server/run_native_process.es&r1=833951&r2=835211&rev=835211&view=diff
==============================================================================
--- couchdb/trunk/test/view_server/run_native_process.es (original)
+++ couchdb/branches/0.10.x/test/run_native_process.es Thu Nov 12 03:25:31 2009
@@ -48,8 +48,8 @@
     end.
 
 main([]) ->
-    code:add_pathz("src/couchdb"),
-    code:add_pathz("src/mochiweb"),
+    code:add_pathz("../src/couchdb"),
+    code:add_pathz("../src/mochiweb"),
     {ok, Pid} = couch_native_process:start_link(),
     loop(Pid).
 

Modified: couchdb/branches/0.10.x/utils/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/utils/Makefile.am?rev=835211&r1=835210&r2=835211&view=diff
==============================================================================
--- couchdb/branches/0.10.x/utils/Makefile.am (original)
+++ couchdb/branches/0.10.x/utils/Makefile.am Thu Nov 12 03:25:31 2009
@@ -20,7 +20,7 @@
 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|%localerlanglibdir%|$(abs_top_srcdir)/src|g" \
 	    -e "s|%mochiwebebindir%|mochiweb|g" \
 	    -e "s|%couchdbebindir%|couchdb|g" \
@@ -28,11 +28,11 @@
 	    -e "s|%oauthebindir%|erlang-oauth|g" \
 	    -e "s|%defaultini%|default_dev.ini|g" \
 	    -e "s|%localini%|local_dev.ini|g" \
-	    -e "s|%localerlanglibdir%|$(abs_top_srcdir)/src|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%|$(abs_top_builddir)/src|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" \



Mime
View raw message