Finish cleanup of src_test blocks for bug #193362. Every core test (eg, not contrib) now passes, for all versions of lucene.

(Portage version: 2.2_rc12/cvs/Linux 2.6.28-rc2-00338-g65fc716 x86_64)

10 files changed, 28 insertions, 22 deletions

diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index 50ddb87b483e..a5d0d2e2bb54 100644
--- a/dev-java/lucene/ChangeLog
+++ b/dev-java/lucene/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/lucene
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.52 2008/11/01 08:15:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.53 2008/11/01 09:39:23 robbat2 Exp $
+
+  01 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> lucene-1.4.3-r3.ebuild,
+  lucene-1.9.1.ebuild, lucene-2.1.0.ebuild, lucene-2.1.0-r1.ebuild,
+  lucene-2.2.0.ebuild, lucene-2.3.0.ebuild, lucene-2.3.1.ebuild,
+  lucene-2.3.2.ebuild, lucene-2.4.0.ebuild:
+  Finish cleanup of src_test blocks for bug #193362. Every core test (eg,
+  not contrib) now passes, for all versions of lucene.
 
   01 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> lucene-2.2.0.ebuild,
   lucene-2.3.0.ebuild, lucene-2.3.1.ebuild, lucene-2.3.2.ebuild,
diff --git a/dev-java/lucene/lucene-1.4.3-r3.ebuild b/dev-java/lucene/lucene-1.4.3-r3.ebuild
index 45ccc742178a..e28fd73ca62d 100644
--- a/dev-java/lucene/lucene-1.4.3-r3.ebuild
+++ b/dev-java/lucene/lucene-1.4.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.4.3-r3.ebuild,v 1.6 2008/01/25 07:34:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.4.3-r3.ebuild,v 1.7 2008/11/01 09:39:23 robbat2 Exp $
 
 JAVA_PKG_IUSE="doc examples source test"
 inherit java-pkg-2 java-ant-2
@@ -31,8 +31,8 @@ src_compile() {
 }
 
 src_test() {
-	java-pkg_jar-from --into lib junit
-	ANT_TASKS="ant-junit" eant test
+	java-ant_rewrite-classpath build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
 }
 
 src_install() {
diff --git a/dev-java/lucene/lucene-1.9.1.ebuild b/dev-java/lucene/lucene-1.9.1.ebuild
index c1682ea173db..d5ef9b943b6f 100644
--- a/dev-java/lucene/lucene-1.9.1.ebuild
+++ b/dev-java/lucene/lucene-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.9.1.ebuild,v 1.3 2008/09/07 15:08:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.9.1.ebuild,v 1.4 2008/11/01 09:39:23 robbat2 Exp $
 
 # This ebuild only builds the core of Lucene
 # It does not build any optional component (contributions)
@@ -39,7 +39,8 @@ src_compile() {
 }
 
 src_test() {
-	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath="$(java-pkg_getjars --build-only junit)"
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
 }
 
 src_install() {
diff --git a/dev-java/lucene/lucene-2.1.0-r1.ebuild b/dev-java/lucene/lucene-2.1.0-r1.ebuild
index 4a51a7e7fd71..f367aafd92c5 100644
--- a/dev-java/lucene/lucene-2.1.0-r1.ebuild
+++ b/dev-java/lucene/lucene-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.1.0-r1.ebuild,v 1.1 2008/01/25 09:52:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.1.0-r1.ebuild,v 1.2 2008/11/01 09:39:23 robbat2 Exp $
 
 JAVA_PKG_IUSE="doc source test"
 JAVA_PKG_BSFIX_ALL="no"
@@ -33,8 +33,7 @@ src_compile() {
 
 src_test() {
 	java-ant_rewrite-classpath common-build.xml
-	local gcp="$(java-pkg_getjars junit)"
-	ANT_TASKS="ant-junit" eant -Dgentoo.classpath="${gcp}" test
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
 }
 
 src_install() {
diff --git a/dev-java/lucene/lucene-2.1.0.ebuild b/dev-java/lucene/lucene-2.1.0.ebuild
index f5a5c444967b..c72a11f6e406 100644
--- a/dev-java/lucene/lucene-2.1.0.ebuild
+++ b/dev-java/lucene/lucene-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.1.0.ebuild,v 1.7 2008/01/25 07:34:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.1.0.ebuild,v 1.8 2008/11/01 09:39:23 robbat2 Exp $
 
 JAVA_PKG_IUSE="doc source test"
 JAVA_PKG_BSFIX_ALL="no"
@@ -33,8 +33,7 @@ src_compile() {
 
 src_test() {
 	java-ant_rewrite-classpath common-build.xml
-	local gcp="$(java-pkg_getjars junit)"
-	ANT_TASKS="ant-junit" eant -Dgentoo.classpath="${gcp}" test
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
 }
 
 src_install() {
diff --git a/dev-java/lucene/lucene-2.2.0.ebuild b/dev-java/lucene/lucene-2.2.0.ebuild
index 772f02b5eb57..c151dde39b35 100644
--- a/dev-java/lucene/lucene-2.2.0.ebuild
+++ b/dev-java/lucene/lucene-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.2.0.ebuild,v 1.2 2008/11/01 08:15:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.2.0.ebuild,v 1.3 2008/11/01 09:39:23 robbat2 Exp $
 
 JAVA_PKG_IUSE="doc source test"
 JAVA_PKG_BSFIX_ALL="no"
@@ -33,7 +33,7 @@ src_compile() {
 
 src_test() {
 	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
 }
 
 src_install() {
diff --git a/dev-java/lucene/lucene-2.3.0.ebuild b/dev-java/lucene/lucene-2.3.0.ebuild
index 6e2110513afa..646eee856098 100644
--- a/dev-java/lucene/lucene-2.3.0.ebuild
+++ b/dev-java/lucene/lucene-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.3.0.ebuild,v 1.4 2008/11/01 08:15:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.3.0.ebuild,v 1.5 2008/11/01 09:39:23 robbat2 Exp $
 
 JAVA_PKG_IUSE="doc source test"
 JAVA_PKG_BSFIX_ALL="no"
@@ -35,7 +35,7 @@ src_compile() {
 
 src_test() {
 	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
 }
 
 src_install() {
diff --git a/dev-java/lucene/lucene-2.3.1.ebuild b/dev-java/lucene/lucene-2.3.1.ebuild
index 65ab576aa810..a1d22ff38624 100644
--- a/dev-java/lucene/lucene-2.3.1.ebuild
+++ b/dev-java/lucene/lucene-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.3.1.ebuild,v 1.2 2008/11/01 08:15:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.3.1.ebuild,v 1.3 2008/11/01 09:39:23 robbat2 Exp $
 
 JAVA_PKG_IUSE="doc source test"
 JAVA_PKG_BSFIX_ALL="no"
@@ -35,7 +35,7 @@ src_compile() {
 
 src_test() {
 	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
 }
 
 src_install() {
diff --git a/dev-java/lucene/lucene-2.3.2.ebuild b/dev-java/lucene/lucene-2.3.2.ebuild
index da9516fca7f3..fc1cec990289 100644
--- a/dev-java/lucene/lucene-2.3.2.ebuild
+++ b/dev-java/lucene/lucene-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.3.2.ebuild,v 1.2 2008/11/01 08:15:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.3.2.ebuild,v 1.3 2008/11/01 09:39:23 robbat2 Exp $
 
 JAVA_PKG_IUSE="doc source test"
 JAVA_PKG_BSFIX_ALL="no"
@@ -35,7 +35,7 @@ src_compile() {
 
 src_test() {
 	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
 }
 
 src_install() {
diff --git a/dev-java/lucene/lucene-2.4.0.ebuild b/dev-java/lucene/lucene-2.4.0.ebuild
index c79352749b8f..8b9b38ab563d 100644
--- a/dev-java/lucene/lucene-2.4.0.ebuild
+++ b/dev-java/lucene/lucene-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.4.0.ebuild,v 1.2 2008/11/01 08:15:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.4.0.ebuild,v 1.3 2008/11/01 09:39:23 robbat2 Exp $
 
 JAVA_PKG_IUSE="doc source test"
 JAVA_PKG_BSFIX_ALL="no"
@@ -35,7 +35,7 @@ src_compile() {
 
 src_test() {
 	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
 }
 
 src_install() {