Hey Paul, great work on these patches. Is the hunk below an accidental commit or do I miss the subtle relevance to the commit message somehow? :)
This also reverts the ability to turn off launching CouchDB for make dev in case you want to run the tests against an already running instance. Cheers Jan -- On Apr 26, 2012, at 00:18 , [email protected] wrote: > Improve the CLI JavaScript stack formating > > [...] > > http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d2fe958/test/javascript/run.tpl > ---------------------------------------------------------------------- > diff --git a/test/javascript/run.tpl b/test/javascript/run.tpl > index ac78b50..3cf7e69 100644 > --- a/test/javascript/run.tpl > +++ b/test/javascript/run.tpl > @@ -36,23 +36,15 @@ else > fi > fi > > - > - > -# stop CouchDB on exit from various signals > -abort() { > - trap - 0 > - ./utils/run -d > - exit 2 > -} > - > # start CouchDB > if [ -z $COUCHDB_NO_START ]; then > make dev > - trap 'abort' 0 1 2 3 4 6 8 15 > ./utils/run -b -r 1 -n \ > -a $SRC_DIR/etc/couchdb/default_dev.ini \ > -a $SRC_DIR/test/random_port.ini \ > -a $SRC_DIR/etc/couchdb/local_dev.ini > + RUN_PID=$! > + trap "./utils/run -d || kill $RUN_PID || exit 2" EXIT > sleep 1 # give it a sec > fi > > @@ -67,12 +59,5 @@ $COUCHJS -H -u $COUCH_URI_FILE \ > $TEST_SRC \ > $JS_TEST_DIR/couch_http.js \ > $JS_TEST_DIR/cli_runner.js > -RESULT=$? > - > -if [ -z $COUCHDB_NO_START ]; then > - # stop CouchDB > - ./utils/run -d > - trap - 0 > -fi > > -exit $RESULT > +exit $? >
