summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-05-14 10:56:44 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-05-14 10:56:44 +0000
commitb418e38f53b2b3f68ca4769a8c5cfed5da7b541d (patch)
treeb7508ca8d9b4ad69fd5ee291826e8037b9edef22 /sys-libs
parentversion bump, removed old versions (diff)
downloadgentoo-2-b418e38f53b2b3f68ca4769a8c5cfed5da7b541d.tar.gz
gentoo-2-b418e38f53b2b3f68ca4769a8c5cfed5da7b541d.tar.bz2
gentoo-2-b418e38f53b2b3f68ca4769a8c5cfed5da7b541d.zip
Bug #319667: Disable the multi_repmgr tests in a different way.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/db/ChangeLog5
-rw-r--r--sys-libs/db/db-5.0.21-r1.ebuild15
2 files changed, 12 insertions, 8 deletions
diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 1bb16759daf0..1890ef670f9a 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/db
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.305 2010/05/14 03:20:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.306 2010/05/14 10:56:44 robbat2 Exp $
+
+ 14 May 2010; Robin H. Johnson <robbat2@gentoo.org> db-5.0.21-r1.ebuild:
+ Bug #319667: Disable the multi_repmgr tests in a different way.
14 May 2010; Robin H. Johnson <robbat2@gentoo.org> -db-5.0.21.ebuild:
Remove broken 5.0.21.
diff --git a/sys-libs/db/db-5.0.21-r1.ebuild b/sys-libs/db/db-5.0.21-r1.ebuild
index 6816448e46fc..3303b0001635 100644
--- a/sys-libs/db/db-5.0.21-r1.ebuild
+++ b/sys-libs/db/db-5.0.21-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.0.21-r1.ebuild,v 1.1 2010/05/14 03:19:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.0.21-r1.ebuild,v 1.2 2010/05/14 10:56:44 robbat2 Exp $
EAPI=2
inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
@@ -188,12 +188,13 @@ src_test() {
# db_repsite is impossible to build, as upstream strips those sources.
# db_repsite is used directly in the setup_site_prog,
# setup_site_prog is called from open_site_prog
- # which is called only from tests
- egrep -ril \
- 'open_site_prog|setup_site_prog|db_repsite' \
- "${S_BASE}/test" \
- | xargs egrep -l '^# TEST ' \
- | xargs rename .tcl .tcl.DISABLED
+ # which is called only from tests in the multi_repmgr group.
+ #sed -ri \
+ # -e '/set subs/s,multi_repmgr,,g' \
+ # "${S_BASE}/test/testparams.tcl"
+ sed -ri \
+ -e '/multi_repmgr/d' \
+ "${S_BASE}/test/test.tcl"
db_src_test
}