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

[ph...@apache.org]

Author: philip
Date: Tue Mar 11 13:35:12 2014
New Revision: 1576339

URL: http://svn.apache.org/r1576339
Log:
Tweak 'make davautocheck' and 'make svnserveautocheck' to work on
Solaris.

* Makefile.in:
  (davautocheck, svnserveautocheck): Use the configured shell rather
   than invoking the scripts directly.

* subversion/tests/cmdline/davautocheck.sh: Avoid "grep -q" as it is
   not portable.

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

Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1576339&r1=1576338&r2=1576339&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Tue Mar 11 13:35:12 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) $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
+	@APXS=$(APXS) $(SHELL) $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
 
 # First, run:
 #   subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline
@@ -586,7 +586,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) \
-	  $(top_srcdir)/subversion/tests/cmdline/svnserveautocheck.sh
+	  $(SHELL) $(top_srcdir)/subversion/tests/cmdline/svnserveautocheck.sh
 
 # First, run:
 #   subversion/svnserve/svnserve --listen-host "::1" -d -r `pwd`/subversion/tests/cmdline

Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/davautocheck.sh?rev=1576339&r1=1576338&r2=1576339&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Tue Mar 11 13:35:12 2014
@@ -142,7 +142,7 @@ get_loadmodule_config() {
   fi
 
   # maybe it's built-in?
-  "$HTTPD" -l | grep -q "$1\\.c" && return
+  "$HTTPD" -l | grep "$1\\.c" >/dev/null && return
 
   return 1
 }
@@ -609,16 +609,16 @@ fi
 say "starting the tests..."
 
 CLIENT_CMD="$ABS_BUILDDIR/subversion/svn/svn"
-$LDD "$CLIENT_CMD" | grep -q 'not found' \
+$LDD "$CLIENT_CMD" | grep 'not found' >/dev/null \
   && fail "Subversion client couldn't be fully linked at run-time"
 
 if [ "$HTTP_LIBRARY" = "" ]; then
   say "Using default dav library"
-  "$CLIENT_CMD" --version | egrep -q '^[*] ra_(neon|serf)' \
+  "$CLIENT_CMD" --version | egrep '^[*] ra_(neon|serf)' >/dev/null \
     || fail "Subversion client couldn't find and/or load ra_dav library"
 else
   say "Requesting dav library '$HTTP_LIBRARY'"
-  "$CLIENT_CMD" --version | egrep -q "^[*] ra_$HTTP_LIBRARY" \
+  "$CLIENT_CMD" --version | egrep "^[*] ra_$HTTP_LIBRARY" >/dev/null \
     || fail "Subversion client couldn't find and/or load ra_dav library '$HTTP_LIBRARY'"
 fi