You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2012/12/22 17:46:25 UTC
[2/2] git commit: Fix `make check-js` for non-`make` builds.
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.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0a5e11e8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0a5e11e8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0a5e11e8
Branch: refs/heads/1.3.x
Commit: 0a5e11e86d2f92c83b0e2643d1e9f593281bb5b3
Parents: 4e1bf75
Author: Jan Lehnardt <ja...@apache.org>
Authored: Sat Dec 22 17:44:30 2012 +0100
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Sat Dec 22 17:44:30 2012 +0100
----------------------------------------------------------------------
Makefile.am | 2 +-
test/javascript/run.tpl | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/0a5e11e8/Makefile.am
----------------------------------------------------------------------
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
http://git-wip-us.apache.org/repos/asf/couchdb/blob/0a5e11e8/test/javascript/run.tpl
----------------------------------------------------------------------
diff --git a/test/javascript/run.tpl b/test/javascript/run.tpl
index 267b6d0..fb43139 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 \