diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2010-05-11 08:00:20 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2010-05-11 08:00:20 +0000 |
| commit | 628c58d6972e13351e446e1d24c2190f30fb96d1 (patch) | |
| tree | f73db1df780b3fcc3f2b54efeda04bc4b8bc5ec3 /eclass | |
| parent | Improve binary renaming to NOT rename all elements in the path, and also pick... (diff) | |
| download | gentoo-2-628c58d6972e13351e446e1d24c2190f30fb96d1.tar.gz gentoo-2-628c58d6972e13351e446e1d24c2190f30fb96d1.tar.bz2 gentoo-2-628c58d6972e13351e446e1d24c2190f30fb96d1.zip | |
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 on it for relative directories.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/db.eclass | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/eclass/db.eclass b/eclass/db.eclass index b2e4256bc213..81d0d5670c15 100644 --- a/eclass/db.eclass +++ b/eclass/db.eclass @@ -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 ebuilds # # 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='' + for t in \ + "${S}"/test/parallel.tcl \ + "${S}"/../test/parallel.tcl ; do + [[ -f "${t}" ]] && test_parallel="${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=`echo "${MAKEOPTS}" | \ |