[gentoo-commits] gentoo-x86 commit in eclass: db.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/05/03 22:13:39

  Modified:             db.eclass
  Log:
  Bug #253312: implement parallel tests for sys-libs/db.

Revision  Changes    Path
1.33                 eclass/db.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?r1=1.32&r2=1.33

Index: db.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -p -w -b -B -u -u -r1.32 -r1.33
--- db.eclass	3 May 2010 22:03:38 -0000	1.32
+++ db.eclass	3 May 2010 22:13:39 -0000	1.33
@@ -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.32 2010/05/03 22:03:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.33 2010/05/03 22:13:39 robbat2 Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@g.o
@@ -124,11 +124,23 @@ db_src_test() {
 	if useq tcl; then
 		einfo "Running sys-libs/db testsuite"
 		ewarn "This can take 6+ hours on modern machines"
-		cd ${S}
+		# Fix stuff that fails with relative paths
+		sed -ri \
+			-e '/regsub {test_path }/s,regsub,#regsub,g' \
+			-e '/regsub {src_root }/s,regsub,#regsub,g' \
+			"${S}"/test/parallel.tcl
+		cd "${S}"
 		echo 'source ../test/test.tcl' >testrunner.tcl
+		testJobs=`echo "${MAKEOPTS}" | \
+				sed -e "s/.*-j\([0-9]\+\).*/\1/"`
+		if [[ ${testJobs} =~ [[:digit:]]+ ]]; then
+			echo "run_parallel ${testJobs} run_std" >> testrunner.tcl
+		else 
 		echo 'run_std' >>testrunner.tcl
+		fi
+
 		tclsh testrunner.tcl
-		egrep -qs '^FAIL' ALL.OUT && die "Some tests failed, please see ${S}/ALL.OUT"
+		egrep -qs '^FAIL' ALL.OUT* && die "Some tests failed, please see ${S}/ALL.OUT*"
 	else
 		eerror "You must have USE=tcl to run the sys-libs/db testsuite."
 	fi