couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [1/2] git commit: Fix `make check-js` for non-`make` builds.
Date Sat, 22 Dec 2012 16:46:24 GMT
Updated Branches:
  refs/heads/1.3.x 4e1bf759a -> 0a5e11e86
  refs/heads/master 5b9708b68 -> 9bdc5cce3


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/9bdc5cce
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9bdc5cce
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9bdc5cce

Branch: refs/heads/master
Commit: 9bdc5cce371ae33c50aa8744eecf267f5d3716d0
Parents: 5b9708b
Author: Jan Lehnardt <jan@apache.org>
Authored: Sat Dec 22 17:44:30 2012 +0100
Committer: Jan Lehnardt <jan@apache.org>
Committed: Sat Dec 22 17:46:14 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/9bdc5cce/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/9bdc5cce/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 \


Mime
View raw message