svn commit: r1576848 - in /subversion/trunk: Makefile.in subversion/tests/cmdline/davautocheck.sh subversion/tests/cmdline/svnserveautocheck.sh

[ph...@apache.org]

Author: philip
Date: Wed Mar 12 18:41:22 2014
New Revision: 1576848

URL: http://svn.apache.org/r1576848
Log:
For things like 'gmake davautocheck' use the specified make program
for the nested make.

* Makefile.in
  (davautocheck, svnserveautocheck): Set MAKE environment variable.

* subversion/tests/cmdline/davautocheck.sh: Use MAKE environment
   variable if set.

* subversion/tests/cmdline/svnserveautocheck.sh: Use MAKE environment
   variable if set.

Modified:
    subversion/trunk/Makefile.in
    subversion/trunk/subversion/tests/cmdline/davautocheck.sh
    subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh

Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1576848&r1=1576847&r2=1576848&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Wed Mar 12 18:41:22 2014
@@ -576,7 +576,7 @@ davcheck: bin $(TEST_DEPS) @BDB_TEST_DEP
 # run make check.
 davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
 	@# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment.
-	@APXS=$(APXS) $(SHELL) $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
+	@APXS=$(APXS) MAKE=$(MAKE) $(SHELL) $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
 
 # First, run:
 #   subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline
@@ -585,7 +585,7 @@ svncheck: bin $(TEST_DEPS) @BDB_TEST_DEP
 
 # 'make svnserveautocheck' runs svnserve for you and kills it.
 svnserveautocheck: svnserve bin $(TEST_DEPS) @BDB_TEST_DEPS@
-	@env PYTHON=$(PYTHON) THREADED=$(THREADED) \
+	@env PYTHON=$(PYTHON) THREADED=$(THREADED) MAKE=$(MAKE) \
 	  $(SHELL) $(top_srcdir)/subversion/tests/cmdline/svnserveautocheck.sh
 
 # First, run:

Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/davautocheck.sh?rev=1576848&r1=1576847&r2=1576848&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Wed Mar 12 18:41:22 2014
@@ -604,6 +604,8 @@ else
   TIME_CMD=""
 fi
 
+MAKE=${MAKE:-make}
+
 say "starting the tests..."
 
 CLIENT_CMD="$ABS_BUILDDIR/subversion/svn/svn"
@@ -619,7 +621,7 @@ else
 fi
 
 if [ $# = 0 ]; then
-  $TIME_CMD make check "BASE_URL=$BASE_URL" $SSL_MAKE_VAR
+  $TIME_CMD "$MAKE" check "BASE_URL=$BASE_URL" $SSL_MAKE_VAR
   r=$?
 else
   (cd "$ABS_BUILDDIR/subversion/tests/cmdline/"

Modified: subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh?rev=1576848&r1=1576847&r2=1576848&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh Wed Mar 12 18:41:22 2014
@@ -98,6 +98,8 @@ else
   TIME_CMD=""
 fi
 
+MAKE=${MAKE:-make}
+
 SVNSERVE_PORT=$(random_port)
 while netstat -an | grep $SVNSERVE_PORT | grep 'LISTEN'; do
   SVNSERVE_PORT=$(random_port)
@@ -119,7 +121,7 @@ fi
 
 BASE_URL=svn://127.0.0.1:$SVNSERVE_PORT
 if [ $# = 0 ]; then
-  $TIME_CMD make check "BASE_URL=$BASE_URL"
+  $TIME_CMD "$MAKE" check "BASE_URL=$BASE_URL"
   r=$?
 else
   cd "$ABS_BUILDDIR/subversion/tests/cmdline/"