diff options
| author | Jan Lehnardt <jan@apache.org> | 2012-12-22 17:44:30 +0100 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2012-12-22 17:46:14 +0100 |
| commit | 9bdc5cce371ae33c50aa8744eecf267f5d3716d0 (patch) | |
| tree | ffdde3ae1564de7a61697dc834287531c44e287a | |
| parent | 5b9708b68ce6d68f4f40235ea880f299b5dcd9e3 (diff) | |
| download | couchdb-9bdc5cce371ae33c50aa8744eecf267f5d3716d0.tar.gz | |
Fix `make check-js` for non-`make` builds.
This patch passes the `$(MAKE)` value to `test/javascript/run`
so it can in turn invoke `$(MAKE)` instead of literal `make`,
so builds that use e.g. `gmake` succeed.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | test/javascript/run.tpl | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index afeea73d7..22853fb25 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 267b6d0b3..fb4313937 100644 --- a/test/javascript/run.tpl +++ b/test/javascript/run.tpl @@ -20,6 +20,13 @@ JS_TEST_DIR=$SRC_DIR/test/javascript COUCHJS=%abs_top_builddir%/src/couchdb/priv/couchjs COUCH_URI_FILE=%localstaterundir%/couch.uri +# make check-js calls us with MAKE=$(MAKE) so BSDish `gmake` invocations +# will get passed on correctly. If $0 gets run manually, default to +# `make` +if [ -z "$MAKE" ]; then + MAKE=make +fi + if [ "$#" -eq 0 ]; then TEST_SRC="$SCRIPT_DIR/test/*.js" @@ -46,7 +53,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 \ |