Andreas Stieger
67ed8c7702
Apache Subversion 1.9.0 OBS-URL: https://build.opensuse.org/request/show/321836 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=216
89 lines
2.6 KiB
Diff
89 lines
2.6 KiB
Diff
------------------------------------------------------------------------
|
|
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
|
|
|
|
------------------------------------------------------------------------
|
|
Index: trunk/subversion/tests/cmdline/svnserveautocheck.sh
|
|
===================================================================
|
|
--- trunk/subversion/tests/cmdline/svnserveautocheck.sh (revision 1665651)
|
|
+++ trunk/subversion/tests/cmdline/svnserveautocheck.sh (revision 1665652)
|
|
@@ -92,11 +92,7 @@
|
|
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 @@
|
|
|
|
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
|
|
Index: trunk/subversion/tests/cmdline/davautocheck.sh
|
|
===================================================================
|
|
--- trunk/subversion/tests/cmdline/davautocheck.sh (revision 1665651)
|
|
+++ trunk/subversion/tests/cmdline/davautocheck.sh (revision 1665652)
|
|
@@ -596,13 +596,8 @@
|
|
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}
|
|
|
|
say "starting the tests..."
|
|
@@ -620,13 +615,13 @@
|
|
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
|
|
|