File subversion-1.8.11-autocheck-time.patch of Package subversion.5431

Overview Repositories Revisions Requests Users Attributes Meta

File subversion-1.8.11-autocheck-time.patch of Package subversion.5431

------------------------------------------------------------------------
r1665652 | astieger | 2015-03-10 20:19:04 +0100 (Tue, 10 Mar 2015) | 13 lines
Changed paths:
   M /subversion/trunk/subversion/tests/cmdline/davautocheck.sh
   M /subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh

Follow-up to r1421594: Fix (svnserve|dav)autocheck when time is only a
built-in.

Some shells do not treat variable contents as a keyword, which in the
case of time makes the script fail if it is a built-in but not a
command.

* subversion/tests/cmdline/svnserveautocheck.sh,
  subversion/tests/cmdline/davautocheck.sh:
  Turn TIME_CMD into a function.

Approved by: breser, danielsh

This is the version of the patch backported to the 1.8 branch.

------------------------------------------------------------------------
---
 subversion/tests/cmdline/davautocheck.sh      |   10 +++-------
 subversion/tests/cmdline/svnserveautocheck.sh |   10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

Index: subversion-1.8.11/subversion/tests/cmdline/davautocheck.sh
===================================================================
--- subversion-1.8.11.orig/subversion/tests/cmdline/davautocheck.sh	2015-03-10 21:05:56.000000000 +0100
+++ subversion-1.8.11/subversion/tests/cmdline/davautocheck.sh	2015-03-10 21:06:50.000000000 +0100
@@ -534,11 +534,7 @@ if [ $# -eq 1 ] && [ "x$1" = 'x--no-test
   exit
 fi
 
-if type time > /dev/null; then
-  TIME_CMD=time
-else
-  TIME_CMD=""
-fi
+if type time > /dev/null ; then TIME_CMD() { time "$@"; } ; else TIME_CMD() { "$@"; } ; fi
 
 say "starting the tests..."
 
@@ -557,13 +553,13 @@ 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/"
   TEST="$1"
   shift
-  $TIME_CMD "$ABS_SRCDIR/subversion/tests/cmdline/${TEST}_tests.py" "--url=$BASE_URL" $SSL_TEST_ARG "$@")
+  TIME_CMD "$ABS_SRCDIR/subversion/tests/cmdline/${TEST}_tests.py" "--url=$BASE_URL" $SSL_TEST_ARG "$@")
   r=$?
 fi
 
Index: subversion-1.8.11/subversion/tests/cmdline/svnserveautocheck.sh
===================================================================
--- subversion-1.8.11.orig/subversion/tests/cmdline/svnserveautocheck.sh	2015-03-10 21:05:50.000000000 +0100
+++ subversion-1.8.11/subversion/tests/cmdline/svnserveautocheck.sh	2015-03-10 21:05:56.000000000 +0100
@@ -92,11 +92,7 @@ random_port() {
   fi
 }
 
-if type time > /dev/null; then
-  TIME_CMD=time
-else
-  TIME_CMD=""
-fi
+if type time > /dev/null ; then TIME_CMD() { time "$@"; } ; else TIME_CMD() { "$@"; } ; fi
 
 SVNSERVE_PORT=$(random_port)
 while netstat -an | grep $SVNSERVE_PORT | grep 'LISTEN'; do
@@ -119,13 +115,13 @@ 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/"
   TEST="$1"
   shift
-  $TIME_CMD "./${TEST}_tests.py" "--url=$BASE_URL" $*
+  TIME_CMD "./${TEST}_tests.py" "--url=$BASE_URL" $*
   r=$?
   cd - > /dev/null
 fi

Places

File subversion-1.8.11-autocheck-time.patch of Package subversion.5431

Places