polynomial-c 14/08/12 19:25:17 Modified: ChangeLog subversion-1.8.10.ebuild Log: Only skip test suite run instead of failing (bug #519740) (Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Revision Changes Path 1.185 dev-vcs/subversion/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?rev=1.185&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?rev=1.185&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?r1=1.184&r2=1.185 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- ChangeLog 12 Aug 2014 11:05:37 -0000 1.184 +++ ChangeLog 12 Aug 2014 19:25:17 -0000 1.185 @@ -1,6 +1,10 @@ # ChangeLog for dev-vcs/subversion # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.184 2014/08/12 11:05:37 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.185 2014/08/12 19:25:17 polynomial-c Exp $ + + 12 Aug 2014; Lars Wendler <polynomia...@gentoo.org> subversion-1.8.10.ebuild: + Only skip test suite run instead of failing when an older version is + installed (bug #519740). *subversion-1.8.10 (12 Aug 2014) 1.2 dev-vcs/subversion/subversion-1.8.10.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.8.10.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.8.10.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.8.10.ebuild?r1=1.1&r2=1.2 Index: subversion-1.8.10.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.10.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- subversion-1.8.10.ebuild 12 Aug 2014 11:05:37 -0000 1.1 +++ subversion-1.8.10.ebuild 12 Aug 2014 19:25:17 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.10.ebuild,v 1.1 2014/08/12 11:05:37 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.10.ebuild,v 1.2 2014/08/12 19:25:17 polynomial-c Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -65,14 +65,6 @@ want_apache -pkg_pretend() { - if use test && ! has_version ~${CATEGORY}/${P} ; then - ewarn "The test suite shows errors when there is an older version of" - ewarn "${CATEGORY}/${PN} installed." - die "Tests will fail due to old version of this package being installed." - fi -} - pkg_setup() { if use berkdb ; then local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ @@ -295,26 +287,33 @@ } src_test() { - default + if has_version ~${CATEGORY}/${P} ; then + default - if use ctypes-python ; then - python_test() { - "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \ - || die "ctypes-python tests fail with ${EPYTHON}" - } + if use ctypes-python ; then + python_test() { + "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \ + || die "ctypes-python tests fail with ${EPYTHON}" + } - distutils-r1_src_test - fi + distutils-r1_src_test + fi - if use python ; then - swig_py_test() { - pushd "${BUILD_DIR}" >/dev/null || die - "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}" - popd >/dev/null || die - } + if use python ; then + swig_py_test() { + pushd "${BUILD_DIR}" >/dev/null || die + "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}" + popd >/dev/null || die + } - BUILD_DIR=subversion/bindings/swig/python \ - python_foreach_impl swig_py_test + BUILD_DIR=subversion/bindings/swig/python \ + python_foreach_impl swig_py_test + fi + else + ewarn "The test suite shows errors when there is an older version of" + ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*" + ewarn "before running the test suite." + ewarn "Test suite skipped." fi }
