From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OBkO8-0003V1-6u for garchives@archives.gentoo.org; Tue, 11 May 2010 08:00:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45986E0857; Tue, 11 May 2010 08:00:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 25A39E0857 for ; Tue, 11 May 2010 08:00:22 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id B9E06671BE for ; Tue, 11 May 2010 08:00:21 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 544) id E07032C4F8; Tue, 11 May 2010 08:00:20 +0000 (UTC) From: "Robin H. Johnson (robbat2)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, robbat2@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: db.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: db.eclass X-VCS-Directories: eclass X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson Content-Type: text/plain; charset=utf8 Message-Id: <20100511080020.E07032C4F8@corvid.gentoo.org> Date: Tue, 11 May 2010 08:00:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 76b74f1b-f3fa-4f78-ac92-c84ce60dae84 X-Archives-Hash: 0f39a8d289344f3f8369db4bb4542031 robbat2 10/05/11 08:00:20 Modified: db.eclass Log: sys-libs/db-5 has changed some of the test scripts slightly, so we need= to look a little wider for parallel.tcl. Also improve the regex we run o= n it for relative directories. Revision Changes Path 1.38 eclass/db.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?r= ev=3D1.38&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?r= ev=3D1.38&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?r= 1=3D1.37&r2=3D1.38 Index: db.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v retrieving revision 1.37 retrieving revision 1.38 diff -p -w -b -B -u -u -r1.37 -r1.38 --- db.eclass 11 May 2010 07:58:43 -0000 1.37 +++ db.eclass 11 May 2010 08:00:20 -0000 1.38 @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.37 2010/05/11 07= :58:43 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.38 2010/05/11 08= :00:20 robbat2 Exp $ # This is a common location for functions used in the sys-libs/db ebuild= s # # Bugs: pauldv@gentoo.org @@ -147,10 +147,17 @@ db_src_test() { einfo "Running sys-libs/db testsuite" ewarn "This can take 6+ hours on modern machines" # Fix stuff that fails with relative paths + local test_parallel=3D'' + for t in \ + "${S}"/test/parallel.tcl \ + "${S}"/../test/parallel.tcl ; do + [[ -f "${t}" ]] && test_parallel=3D"${t}" && break + done + sed -ri \ - -e '/regsub {test_path }/s,regsub,#regsub,g' \ - -e '/regsub {src_root }/s,regsub,#regsub,g' \ - "${S}"/test/parallel.tcl + -e '/regsub .test_path ./s,(regsub),#\1,g' \ + -e '/regsub .src_root ./s,(regsub),#\1,g' \ + "${test_parallel}" cd "${S}" echo 'source ../test/test.tcl' > testrunner.tcl testJobs=3D`echo "${MAKEOPTS}" | \