diff options
author | 2012-04-30 12:24:08 +0000 | |
---|---|---|
committer | 2012-04-30 12:24:08 +0000 | |
commit | 90875399b53ae6b4fb1f3e0442f8da80349db689 (patch) | |
tree | 26e5b256981ac27f408d60aac4dee5820baa8dc6 /kde-base | |
parent | Stable for X86, wrt bug #412657 (diff) | |
download | gentoo-2-90875399b53ae6b4fb1f3e0442f8da80349db689.tar.gz gentoo-2-90875399b53ae6b4fb1f3e0442f8da80349db689.tar.bz2 gentoo-2-90875399b53ae6b4fb1f3e0442f8da80349db689.zip |
Re-enable tests, patch out a failing test by Chris Reffett <geekboy72@gmail.com> bug #264917.
(Portage version: 2.2.0_alpha101/cvs/Linux i686)
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/okteta/ChangeLog | 7 | ||||
-rw-r--r-- | kde-base/okteta/files/okteta-4.8.2-test.patch | 29 | ||||
-rw-r--r-- | kde-base/okteta/okteta-4.8.2.ebuild | 6 |
3 files changed, 38 insertions, 4 deletions
diff --git a/kde-base/okteta/ChangeLog b/kde-base/okteta/ChangeLog index 06086fbb8e10..8828dab31a76 100644 --- a/kde-base/okteta/ChangeLog +++ b/kde-base/okteta/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/okteta # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.105 2012/04/18 20:30:21 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.106 2012/04/30 12:24:08 johu Exp $ + + 30 Apr 2012; Johannes Huber <johu@gentoo.org> +files/okteta-4.8.2-test.patch, + okteta-4.8.2.ebuild: + Re-enable tests, patch out a failing test by Chris Reffett + <geekboy72@gmail.com> bug #264917. 18 Apr 2012; Markus Meier <maekke@gentoo.org> okteta-4.8.1.ebuild: x86 stable, bug #409403 diff --git a/kde-base/okteta/files/okteta-4.8.2-test.patch b/kde-base/okteta/files/okteta-4.8.2-test.patch new file mode 100644 index 000000000000..ef6425c5cda9 --- /dev/null +++ b/kde-base/okteta/files/okteta-4.8.2-test.patch @@ -0,0 +1,29 @@ +--- okteta/core/piecetable/tests/CMakeLists.txt ++++ okteta/core/piecetable/tests/CMakeLists.txt +@@ -134,26 +134,6 @@ + oktetacoretestutil ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ) + + +-########### grouppiecetablechangeabstractpiecetablechangeiftest ############### +- +-set( grouppiecetablechangeabstractpiecetablechangeiftest_SRCS +- grouppiecetablechangeabstractpiecetablechangeiftest.cpp +- ${abstractpiecetablechangeiftest_SRCS} +- ${SUTDIR}/addressrangelist.cpp +- ${SUTDIR}/piecetable/replacepiecetablechange.cpp +- ${SUTDIR}/piecetable/insertpiecetablechange.cpp +- ${SUTDIR}/piecetable/removepiecetablechange.cpp +- ${SUTDIR}/piecetable/grouppiecetablechange.cpp +-) +- +-kde4_add_unit_test( grouppiecetablechangeabstractpiecetablechangeiftest +- TESTNAME libpiecetable-grouppiecetablechangeabstractpiecetablechangeiftest +- ${grouppiecetablechangeabstractpiecetablechangeiftest_SRCS} +-) +-target_link_libraries( grouppiecetablechangeabstractpiecetablechangeiftest +- oktetacoretestutil ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ) +- +- + ########### grouppiecetablechangetest ############### + + set( grouppiecetablechangetest_SRCS diff --git a/kde-base/okteta/okteta-4.8.2.ebuild b/kde-base/okteta/okteta-4.8.2.ebuild index 68db00993eae..8635de2fdb5b 100644 --- a/kde-base/okteta/okteta-4.8.2.ebuild +++ b/kde-base/okteta/okteta-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/okteta-4.8.2.ebuild,v 1.1 2012/04/04 23:58:57 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/okteta-4.8.2.ebuild,v 1.2 2012/04/30 12:24:08 johu Exp $ EAPI=4 @@ -17,5 +17,5 @@ DEPEND=" " RDEPEND="${DEPEND}" -# Tests hang, last checked in 4.3.3 -RESTRICT="test" +# bug #264917, removes failing test +PATCHES=( "${FILESDIR}/${PN}-4.8.2-test.patch" ) |