[gentoo-commits] gentoo-x86 commit in sys-libs/db: ChangeLog db-5.0.21-r1.ebuild

["Robin H. Johnson (robbat2)" <robbat2@gentoo.org>]

robbat2     10/05/14 10:56:44

  Modified:             ChangeLog db-5.0.21-r1.ebuild
  Log:
  Bug #319667: Disable the multi_repmgr tests in a different way.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.306                sys-libs/db/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/ChangeLog?rev=1.306&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/ChangeLog?rev=1.306&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/ChangeLog?r1=1.305&r2=1.306

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v
retrieving revision 1.305
retrieving revision 1.306
diff -p -w -b -B -u -u -r1.305 -r1.306
--- ChangeLog	14 May 2010 03:20:08 -0000	1.305
+++ ChangeLog	14 May 2010 10:56:44 -0000	1.306
@@ -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.



1.2                  sys-libs/db/db-5.0.21-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/db-5.0.21-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/db-5.0.21-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/db-5.0.21-r1.ebuild?r1=1.1&r2=1.2

Index: db-5.0.21-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.0.21-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- db-5.0.21-r1.ebuild	14 May 2010 03:19:25 -0000	1.1
+++ db-5.0.21-r1.ebuild	14 May 2010 10:56:44 -0000	1.2
@@ -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
 }