You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by as...@apache.org on 2015/03/10 20:19:04 UTC
svn commit: r1665652 - in /subversion/trunk/subversion/tests/cmdline:
davautocheck.sh svnserveautocheck.sh
Author: astieger
Date: Tue Mar 10 19:19:04 2015
New Revision: 1665652
URL: http://svn.apache.org/r1665652
Log:
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
Modified:
subversion/trunk/subversion/tests/cmdline/davautocheck.sh
subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh
Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/davautocheck.sh?rev=1665652&r1=1665651&r2=1665652&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Tue Mar 10 19:19:04 2015
@@ -596,12 +596,7 @@ if [ $# -eq 1 ] && [ "x$1" = 'x--gdb' ];
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
MAKE=${MAKE:-make}
@@ -620,13 +615,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
Modified: subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh?rev=1665652&r1=1665651&r2=1665652&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh Tue Mar 10 19:19:04 2015
@@ -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
MAKE=${MAKE:-make}
@@ -121,13 +117,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