incubator-couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jan Lehnardt <...@apache.org>
Subject Re: [STATUS] CouchDB 1.3 release
Date Fri, 21 Dec 2012 21:47:06 GMT
Good catch.

This seems to fix it:

diff --git a/Makefile.am b/Makefile.am
index afeea73..22853fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,7 +91,7 @@ endif
 check-js: dev
 if TESTS
 if USE_CURL
-       $(top_builddir)/test/javascript/run
+       MAKE=$(MAKE) $(top_builddir)/test/javascript/run
 endif
 endif
 
diff --git a/test/javascript/run.tpl b/test/javascript/run.tpl
index 267b6d0..a2d69fd 100644
--- a/test/javascript/run.tpl
+++ b/test/javascript/run.tpl
@@ -46,7 +46,7 @@ abort() {
 
 # start CouchDB
 if [ -z $COUCHDB_NO_START ]; then
-        make dev
+    $MAKE dev
     trap 'abort' EXIT
        ./utils/run -b -r 1 -n \
                -a $BUILD_DIR/etc/couchdb/default_dev.ini \


Shall I commit this to 1.3.x & master?

Cheers
Jan
-- 





On Dec 21, 2012, at 22:34 , Noah Slater <nslater@apache.org> wrote:

> We do some funky shit with 'SAFE_MAKE' as part of the docs changes, but this should be
portable. Judging by your paste, the problem is in test/javascript/run, and sure enough, there
are some raw make calls. Looks like a longstanding issue. Are you able to experiment in this
file? It should be possible to pick up $MAKE. If not, 'export' it manually from the calling
Makefile.am. DM me if you need me to check this thread again tonight or pop on to a laptop.
> 
> On Friday, 21 December 2012, Jan Lehnardt wrote:
> Hi Noah,
> 
> On FreeBSD 9.0 `gmake distcheck`* fails with:
> 
>     ...
>     ./test/javascript/run
>     make: don't know how to make w. Stop
>     gmake[1]: *** [check-js] Error 2
>     gmake[1]: Leaving directory `/usr/home/jan/src/couchdb/apache-couchdb-1.3.0a-4e1bf75-git/_build'
>     gmake: *** [distcheck] Error 1
> 
> I can verify that manual execution of `gmake check` works just fine. My guess would point
at an invocation of make as `make` instead of $(MAKE) somewhere in the distcheck bowels. A
cursory look didn’t reveal anything obvious, so I hoped you can shed a light on this.
> 
> Thanks!
> Jan
> --
> * (FreeBSD users know to use `gmake` for `make`, as `make often fails, including in our
case)
> 
> 
> 
> On Dec 13, 2012, at 17:16 , Noah Slater <nslater@apache.org> wrote:
> 
> > Okay, thanks!
> >
> >
> > On 13 December 2012 15:18, Benoit Chesneau <bchesneau@gmail.com> wrote:
> >
> >> On Thu, Dec 13, 2012 at 3:52 PM, Noah Slater <nslater@apache.org> wrote:
> >>
> >>> How long do you want to digest the changes, Benoit? Can you be specific?
> >>>
> >>
> >> Like I said I was ;) Dave already answered to my question somehow.
> >>
> >> - benoît
> >>
> >
> >
> >
> > --
> > NS
> 
> 
> 
> -- 
> NS


Mime
View raw message