Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Received-SPF: pass (nike.apache.org: domain of randall.leeds@gmail.com
 designates 209.85.210.44 as permitted sender)
MIME-Version: 1.0
Sender: randall.leeds@gmail.com
In-Reply-To: <D30229BA-BF0C-467F-9465-EAABB1C5C367@apache.org>
References: <20120127013712.8829B319D8A@tyr.zones.apache.org>
	<A1AA0FC4-86BD-4084-A4FA-7A2BB84D120A@apache.org>
	<D30229BA-BF0C-467F-9465-EAABB1C5C367@apache.org>
Date: Tue, 24 Apr 2012 10:04:34 -0700
Message-ID: 
 <CAAL6JQjDOLEgEWNkZHHBDcVNd-mBRSau-xWD=7+eKDWeoKbcVg@mail.gmail.com>
Subject: Re: [2/7] git commit: COUCHDB-1338 - run js tests with port=0
From: Randall Leeds <randall@apache.org>
To: dev@couchdb.apache.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On Tue, Apr 24, 2012 at 08:08, Jan Lehnardt <jan@apache.org> wrote:
>
> On Apr 24, 2012, at 17:05 , Jan Lehnardt wrote:
>
>>
>> On Jan 27, 2012, at 02:37 , randall@apache.org wrote:
>>
>>> COUCHDB-1338 - run js tests with port=3D0
>>>
>>> When the JS tests POST to /_restart, the server comes back up on a
>>> different port. To work around this, add a getter property for the
>>> CouchHTTP.prototype.base_url property, using a reserved slot on the
>>> object to store the value.
>>>
>>>
>>> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
>>> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d20e7926
>>> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d20e7926
>>> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d20e7926
>>>
>>> Branch: refs/heads/master
>>> Commit: d20e792617db738dd5ad0e046ae847cd740f586f
>>> Parents: 257eb52
>>> Author: Randall Leeds <randall@apache.org>
>>> Authored: Sat Jan 7 14:21:29 2012 -0800
>>> Committer: Randall Leeds <randall@apache.org>
>>> Committed: Thu Jan 26 17:03:10 2012 -0800
>>>
>>> ----------------------------------------------------------------------
>>> src/couchdb/priv/couch_js/help.h =C2=A0| =C2=A0 =C2=A02 +
>>> src/couchdb/priv/couch_js/http.c =C2=A0| =C2=A0 60 ++++++++++++++++++++=
+++++++++++-
>>> src/couchdb/priv/couch_js/http.h =C2=A0| =C2=A0 =C2=A03 ++
>>> src/couchdb/priv/couch_js/sm170.c | =C2=A0 =C2=A08 ++++
>>> src/couchdb/priv/couch_js/sm180.c | =C2=A0 =C2=A08 ++++
>>> src/couchdb/priv/couch_js/sm185.c | =C2=A0 =C2=A08 ++++
>>> src/couchdb/priv/couch_js/util.c =C2=A0| =C2=A0 =C2=A03 +-
>>> src/couchdb/priv/couch_js/util.h =C2=A0| =C2=A0 =C2=A02 +
>>> test/Makefile.am =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0| =C2=A0 =C2=A01 +
>>> test/etap/Makefile.am =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | =C2=
=A0 =C2=A01 -
>>> test/etap/random_port.ini =C2=A0 =C2=A0 =C2=A0 =C2=A0 | =C2=A0 19 -----=
-----
>>> test/etap/test_util.erl.in =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2=A0 =C2=A02 =
+-
>>> test/javascript/Makefile.am =C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=A01 +
>>> test/javascript/couch_http.js =C2=A0 =C2=A0 | =C2=A0 =C2=A09 ++---
>>> test/javascript/run.tpl =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=
=A09 ++++-
>>> test/random_port.ini =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| =
=C2=A0 19 ++++++++++
>>> 16 files changed, 125 insertions(+), 30 deletions(-)
>>> ----------------------------------------------------------------------
>>>
>>>
>>> [...]
>>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/d20e7926/test/javas=
cript/run.tpl
>>> ----------------------------------------------------------------------
>>> diff --git a/test/javascript/run.tpl b/test/javascript/run.tpl
>>> index 47d2f6e..ac78b50 100644
>>> --- a/test/javascript/run.tpl
>>> +++ b/test/javascript/run.tpl
>>> @@ -17,6 +17,7 @@ SCRIPT_DIR=3D$SRC_DIR/share/www/script
>>> JS_TEST_DIR=3D$SRC_DIR/test/javascript
>>>
>>> COUCHJS=3D%abs_top_builddir%/src/couchdb/priv/couchjs
>>> +COUCH_URI_FILE=3D%localstaterundir%/couch.uri
>>>
>>> if [ "$#" -eq 0 ];
>>> then
>>> @@ -48,11 +49,15 @@ abort() {
>>> if [ -z $COUCHDB_NO_START ]; then
>>> =C2=A0 =C2=A0 =C2=A0 =C2=A0make dev
>>> =C2=A0 =C2=A0 =C2=A0trap 'abort' 0 1 2 3 4 6 8 15
>>> - =C2=A0 =C2=A0./utils/run -b -r 1
>>> + =C2=A0 =C2=A0./utils/run -b -r 1 -n \
>>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-a $SRC_DIR/etc/couchdb/defa=
ult_dev.ini \
>>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-a $SRC_DIR/test/random_port=
.ini \
>>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-a $SRC_DIR/etc/couchdb/loca=
l_dev.ini
>>
>>
>> Randall, this breaks vpath builds. removing the -n option and the -n lin=
es makes it work for me.
>
> =E2=80=A6 and the -a lines =E2=80=A6

Hmm. Maybe it should be "$(abs_top_builddir)" instead of SRC_DIR?
The -a ...random_port.ini is the crucial one, because that's the point
of the patch. I can't remember at this moment why I needed to specify
exactly all the configs and use the -n to reset the config chain, but
I'm sure there was a reason (like random_port.ini not getting
preference over default_dev.ini or something).

-R