Accepting request 207532 from home:AndreasStieger:branches:svn-ppc
- print error logs on on regression test failures - always build with and statically link to in-tree SQLite to prevent failures with SQLite 3.8 - fix regression tests for ppc/ppc64 architectures, found in openSUSE package build and fixed with upstream developers, adding subversion-1.8.x-fix-ppc-tests.patch OBS-URL: https://build.opensuse.org/request/show/207532 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=144
This commit is contained in:
Git OBS Bridge
parent
974fac4913
commit
02b588ae2f
47
subversion-1.8.x-fix-ppc-tests.patch
Normal file
47
subversion-1.8.x-fix-ppc-tests.patch
Normal file
@ -0,0 +1,47 @@
|
||||
From: Bert Huijben <rhuijben@collab.net>
|
||||
Date: Mon, 18 Nov 2013 20:43:23 +0000
|
||||
Subject: [PATCH] fix regression test failures on ppc/ppc64
|
||||
Upstream: committed
|
||||
References: https://svn.apache.org/viewvc?view=revision&revision=1543145
|
||||
|
||||
Fixes regression test failures on ppc/ppc64.
|
||||
[ 1518s] At least one test FAILED, checking /home/abuild/rpmbuild/BUILD/subversion-1.8.5/tests.log
|
||||
[ 1518s] FAIL: wc_tests.py 7: inaccessible .svn/wc.db
|
||||
[ 1518s] FAIL: wc_tests.py 8: corrupt .svn/wc.db
|
||||
[ 1518s] FAIL: wc_tests.py 9: zero-length .svn/wc.db
|
||||
[ 1518s] FAIL: wc_tests.py 10: missing .svn/wc.db
|
||||
[ 1518s] FAIL: wc_tests.py 12: missing .svn/wc.db, maybe valid .svn/entries
|
||||
[ 1518s] Summary of test results:
|
||||
|
||||
------------------------------------------------------------------------
|
||||
r1543145 | rhuijben | 2013-11-18 20:43:23 +0000 (Mon, 18 Nov 2013) | 9 lines
|
||||
Changed paths:
|
||||
M /subversion/trunk/subversion/svn/status-cmd.c
|
||||
|
||||
Resolve a strange error that somehow occurred only on some specific powerpc
|
||||
architectures. The real problem is that we didn't properly detect the end of
|
||||
the variable argument list, so it can fail on all architectures.
|
||||
|
||||
Found by: astieger
|
||||
|
||||
* subversion/svn/status-cmd.c
|
||||
(svn_cl__status): Add missing end of warning status values marker.
|
||||
|
||||
---
|
||||
subversion/svn/status-cmd.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: subversion-1.8.4/subversion/svn/status-cmd.c
|
||||
===================================================================
|
||||
--- subversion-1.8.4.orig/subversion/svn/status-cmd.c 2013-07-27 05:00:17.000000000 +0100
|
||||
+++ subversion-1.8.4/subversion/svn/status-cmd.c 2013-11-18 20:57:53.000000000 +0000
|
||||
@@ -358,7 +358,8 @@ svn_cl__status(apr_getopt_t *os,
|
||||
NULL, opt_state->quiet,
|
||||
/* not versioned: */
|
||||
SVN_ERR_WC_NOT_WORKING_COPY,
|
||||
- SVN_ERR_WC_PATH_NOT_FOUND));
|
||||
+ SVN_ERR_WC_PATH_NOT_FOUND,
|
||||
+ SVN_NO_ERROR));
|
||||
|
||||
if (opt_state->xml)
|
||||
SVN_ERR(print_finish_target_xml(repos_rev, iterpool));
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 18 21:01:46 UTC 2013 - andreas.stieger@gmx.de
|
||||
|
||||
- print error logs on on regression test failures
|
||||
- always build with and statically link to in-tree SQLite to
|
||||
prevent failures with SQLite 3.8
|
||||
- fix regression tests for ppc/ppc64 architectures, found in
|
||||
openSUSE package build and fixed with upstream developers, adding
|
||||
subversion-1.8.x-fix-ppc-tests.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Nov 17 20:59:20 UTC 2013 - andreas.stieger@gmx.de
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
%define with_ruby 0%{?suse_version} > 1110
|
||||
%define with_intree_swig 0%{?suse_version} != 1110
|
||||
%define with_intree_sqlite 0%{?suse_version} < 1310
|
||||
%define with_intree_sqlite 1
|
||||
%define with_python_ctypes 0
|
||||
%define with_kde4_kwallet 0%{?suse_version} > 1100
|
||||
%define with_gnome_keyring 0%{?suse_version} > 1100
|
||||
@ -174,6 +174,7 @@ Patch20: subversion-swig-perl-install_vendor.patch
|
||||
Patch23: subversion.libtool-pie-flags.patch
|
||||
Patch31: subversion.perl.LD_RUN_PATH.patch
|
||||
Patch37: subversion-no-build-date.patch
|
||||
Patch38: subversion-1.8.x-fix-ppc-tests.patch
|
||||
#
|
||||
%if %with_ruby
|
||||
%define rb_arch %(echo "%{_host_cpu}-%{_os}" | sed -e "s/i686/i586/" -e "s/armv5tel/armv4l/" -e "s/hppa2.0/hppa/")
|
||||
@ -338,6 +339,7 @@ popd #./sqlite-amalgamation
|
||||
%patch23 -p1
|
||||
%patch31 -p1
|
||||
%patch37 -p1
|
||||
%patch38 -p1
|
||||
|
||||
SQLITE_RECOMMENDED_VER=$(grep -E '^SQLITE_RECOMMENDED_VER=' configure.ac|cut -f2 -d=|cut -f2 -d\")
|
||||
#"
|
||||
@ -614,24 +616,24 @@ test "$sqlite_info" = " SQLite %{sqlite_version} (static)"
|
||||
%if %{with regression_tests}
|
||||
|
||||
# run tests over ra_local (file://)
|
||||
%__make check CLEANUP=true FS_TYPE=fsfs
|
||||
%__make check CLEANUP=true FS_TYPE=fsfs || (cat fails.log; exit 1)
|
||||
|
||||
# run tests over ra_svn (svn://)
|
||||
%__make svnserveautocheck CLEANUP=true FS_TYPE=fsfs
|
||||
%__make svnserveautocheck CLEANUP=true FS_TYPE=fsfs || (cat fails.log; exit 1)
|
||||
|
||||
# run tests over ra_serf (http://)
|
||||
%__make davautocheck CLEANUP=true FS_TYPE=fsfs HTTP_LIBRARY=serf
|
||||
%__make davautocheck CLEANUP=true FS_TYPE=fsfs HTTP_LIBRARY=serf || (cat fails.log; exit 1)
|
||||
|
||||
%if %with_java
|
||||
%__make check-javahl
|
||||
%__make check-javahl || (cat fails.log; exit 1)
|
||||
%endif # with_java
|
||||
%__make check-swig-pl
|
||||
%__make check-swig-pl || (cat fails.log; exit 1)
|
||||
%if 0%{?suse_version} > 1140
|
||||
# python bindings fail testsuite on 11.4
|
||||
%__make check-swig-py
|
||||
%__make check-swig-py || (cat fails.log; exit 1)
|
||||
%endif
|
||||
%if %with_ruby
|
||||
%__make check-swig-rb
|
||||
%__make check-swig-rb || (cat fails.log; exit 1)
|
||||
%endif # with_ruby
|
||||
|
||||
%endif # with regression_tests
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user