diff --git a/subversion-1.8.11-autocheck-time.patch b/subversion-1.8.11-autocheck-time.patch new file mode 100644 index 0000000..23d92dd --- /dev/null +++ b/subversion-1.8.11-autocheck-time.patch @@ -0,0 +1,93 @@ +------------------------------------------------------------------------ +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 diff --git a/subversion.changes b/subversion.changes index ff7c096..6c38032 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 10 20:09:16 UTC 2015 - astieger@suse.com + +- Fix running all regression tests with davautocheck.sh and + svnserveautocheck.sh when time is a shell built-in but not + a command: add subversion-1.8.11-autocheck-time.patch + ------------------------------------------------------------------- Wed Mar 4 18:12:54 UTC 2015 - astieger@suse.com diff --git a/subversion.spec b/subversion.spec index 21b9b5c..b3aee93 100644 --- a/subversion.spec +++ b/subversion.spec @@ -70,6 +70,7 @@ Patch41: subversion-1.8.10-fix-bashisms.patch Patch42: subversion-1.8.11-swig-py-comment.patch Patch43: subversion-1.8.11-swig-py-comment-2.patch Patch44: subversion-1.8.11-swig-py-comment-3.patch +Patch45: subversion-1.8.11-autocheck-time.patch BuildRequires: apache2-devel BuildRequires: apache2-prefork BuildRequires: cyrus-sasl-devel @@ -111,6 +112,9 @@ BuildRequires: python-pysqlite # tools required for network based tests BuildRequires: net-tools BuildRequires: wget +%if %{?suse_version} >= 1310 +BuildRequires: time +%endif %endif %if %{with python_ctypes} BuildRequires: ctypesgen @@ -236,9 +240,10 @@ parameters and keywords for the svn command and other tools. %patch39 %patch40 -p1 %patch41 -p1 -%patch42 -p0 -%patch43 -p0 +%patch42 +%patch43 %patch44 -p1 +%patch45 -p1 %build # Re-boot strap, needed for patch37