[patch] java-pkg-2_supports-test.patch

java-pkg-2_supports-test.patch (text/plain), 1.16 KB, created by James Le Cuirot on 2015-06-16 22:24:11 UTC

Index: java-pkg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v
retrieving revision 1.40
diff -u -B -r1.40 java-pkg-2.eclass
--- java-pkg-2.eclass	28 Apr 2015 20:35:40 -0000	1.40
+++ java-pkg-2.eclass	16 Jun 2015 22:23:09 -0000
@@ -96,25 +96,6 @@
 	fi
 }
 
-
-# @FUNCTION: java-pkg-2_supports-test
-# @INTERNAL
-# @DESCRIPTION:
-# test whether a build.xml has a test target.
-
-java-pkg-2_supports-test() {
-	python << EOF
-from xml.dom.minidom import parse
-import sys
-dom = parse("${1}")
-for elem in dom.getElementsByTagName('target'):
-	if elem.getAttribute('name') == 'test':
-			sys.exit(0)
-sys.exit(1)
-EOF
-	return $?
-}
-
 # @FUNCTION: java-pkg-2_src_test
 # @DESCRIPTION:
 # src_test, not exported.
@@ -122,7 +103,7 @@
 java-pkg-2_src_test() {
 	[[ -e "${EANT_BUILD_XML:=build.xml}" ]] || return
 
-	if [[ ${EANT_TEST_TARGET} ]] || java-pkg-2_supports-test ${EANT_BUILD_XML}; then
+	if [[ ${EANT_TEST_TARGET} ]] || < "${EANT_BUILD_XML}" tr -d "\n" | grep -Eq "<target\b[^>]*\bname=[\"']test[\"']"; then
 		local opts task_re junit_re pkg
 
 		if [[ ${EANT_TEST_JUNIT_INTO} ]]; then