commit: a881fd22476f5aa7fee6edc868dc574467b99f5f Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Jan 16 23:31:43 2016 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Jan 17 00:01:19 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a881fd22
dev-java/testng: Remove old Package-Manager: portage-2.2.26 dev-java/testng/Manifest | 1 - dev-java/testng/files/testng-6.8-build-tests.xml | 188 --------------------- .../files/testng-6.8-remove-ivy-retrieve.patch | 22 --- .../files/testng-6.8-remove-jar-bundling.patch | 60 ------- dev-java/testng/testng-6.8-r4.ebuild | 100 ----------- 5 files changed, 371 deletions(-) diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest index 2e19fa9..7f442f0 100644 --- a/dev-java/testng/Manifest +++ b/dev-java/testng/Manifest @@ -1,2 +1 @@ -DIST testng-6.8.zip 11550802 SHA256 72c7241109b149caea01af5f5c37c86b61b08f15864a8a40e15d069593625e0c SHA512 2e8ad30a2c2f68d0aad584ef92246381c8adf8a893af2ca9ff8fb7d304c26956dfc6564f120de80d22e3e7a53a1402e3869f19ef0e6a69c674cbe35a58811920 WHIRLPOOL b7cf05963aaba3009d7326fee12694c32798787ee4295044daabdcf6b5a50dbb4b17f2a201dcdcd6d191bbc6665c12db789be80e71625eb8d08ca29b3cdfcff2 DIST testng-6.9.10.tar.gz 6271781 SHA256 2155f0461f6b80433781968b9465627f877ea579086cb4149ca68e5e711d8127 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e WHIRLPOOL 38ae9ac8732ee96f0c0c9f48e5e5ba1cef342ea2f866322d22064b8aca4d405318fcce8e4a1bd7ba6276645429fe3a9ec8be42a8e2065cbb0d99dc6b2a0059d7 diff --git a/dev-java/testng/files/testng-6.8-build-tests.xml b/dev-java/testng/files/testng-6.8-build-tests.xml deleted file mode 100644 index e94606b..0000000 --- a/dev-java/testng/files/testng-6.8-build-tests.xml +++ /dev/null @@ -1,188 +0,0 @@ -<!-- From: https://github.com/cbeust/testng/blob/master/build-tests.xml --> - -<project name="testng" default="all" basedir="."> - - <property file="build.properties"/> - - <property name="report.dir" value="${test.output.dir}"/> - <property name="junit.report.dir" value="${report.dir}/test-tmp"/> - <property name="testng.report.dir" value="${report.dir}"/> - - <target name="all" depends="prepare,compile,run,reports,done"/> - - <!-- ==================================================================== --> - <!-- Compile --> - <!-- ==================================================================== --> - <path id="compile.cp"> - <pathelement location="${testng.jar}" /> - <fileset dir="${lib.dir}" includes="${guice2.jar}" /> - <fileset dir="${lib.dir}" includes="${junit.jar}" /> - </path> - - <target name="env:info"> - <echo> -BASEDIR =${basedir} -TEST.DIR =${test.dir} -TEST.BUILD.DIR =${test.build.dir} -REPORT.DIR =${report.dir} -JUNIT.REPORT.DIR =${junit.report.dir} -TESTNG.REPORT.DIR=${testng.report.dir} - </echo> - </target> - - <target name="compile" depends="prepare"> - <echo message=" -- Compiling tests --"/> - - <property name="build.compiler" value="modern"/> - <javac debug="true" - source="1.5" - classpathref="compile.cp" - srcdir="${test.dir}" - destdir="${test.build.dir}" - /> - - </target> - - <target name="prepare"> - <tstamp/> - <mkdir dir="${test.build.dir}"/> - <mkdir dir="${junit.report.dir}"/> - <mkdir dir="${testng.report.dir}"/> - - <taskdef name="testng" - classname="org.testng.TestNGAntTask" - classpath="${build.dir}"/> - </target> - -<!-- - <property name="cobertura.dir" value="../cobertura-1.9.4.1" /> - - <path id="cobertura.classpath"> - <fileset dir="${cobertura.dir}"> - <include name="cobertura.jar" /> - <include name="lib/**/*.jar" /> - </fileset> - </path> ---> - - <!-- ==================================================================== --> - <!-- Run --> - <!-- ==================================================================== --> - - <path id="run.cp"> -<!-- - <path location="target/instrumented-classes" /> - <path refid="cobertura.classpath" /> ---> - <path refid="compile.cp"/> - <pathelement location="${test.build.dir}"/> - </path> - - <target name="run" description="Run tests" depends="compile,copy-resources"> - <echo message=" -- Running tests --"/> - <echo message=" -- ${testng.jar} --" /> - <testng classpathref="run.cp" - outputdir="${testng.report.dir}"> - <xmlfileset dir="${test.resources.dir}" includes="testng.xml"/> - <jvmarg value="-Dtest.resources.dir=${test.resources.dir}" /> - <jvmarg value="-Dsun.io.serialization.extendedDebugInfo=true" /> - </testng> - </target> - - <target name="copy-resources" description="Copies resources."> - <copy verbose="false" - file="${src.resources.dir}/testngtasks" - todir="${build.dir}" /> - <copy todir="${build.dir}"> - <fileset dir="${src.resources.dir}"> - <exclude name="**/.*" /> - <exclude name="**/CVS/*" /> - </fileset> - </copy> - </target> - - <target name="run:single" description="Run 1 property file named with the ant property test" depends="compile"> - <echo message=" -- testng-tests-run1 --"/> - - <testng outputdir="${testng.report.dir}" - classpathref="run.cp" - useDefaultListeners="true" - outputDir="${testng.report.dir}"> - <xmlfileset dir="${test.resources.dir}" includes="testng-single.xml"/> - </testng> - - <echo>Report created in open ${testng.report.dir}/index.html</echo> - </target> - - <target name="run:antprop" description="Run a test to see if ant system propertes are passed correctly" depends="compile"> - <echo message=" -- testng-tests-run-antprop --"/> - <property name="syspropset1" value="value 1"/> - <property name="syspropset2" value="value 2"/> - <propertyset id="propset1"> - <propertyref name="syspropset1"/> - <propertyref name="syspropset2"/> - </propertyset> - - <testng outputdir="${testng.report.dir}" - classpathref="run.cp"> - <xmlfileset dir="${test.resources.dir}" includes="testng-single3.xml"/> - <propertyset refid="propset1"/> - <sysproperty key="sysprop1" value="value 3"/> - </testng> - </target> - - <!-- ==================================================================== --> - <!-- Run specific configuration --> - <!-- ==================================================================== --> - <target name="run:conf" - if="testng.conf" - depends="clean:reports,compile" - description="Run specified tests"> - <echo message=" -- testng-tests-run --"/> - <echo message="using: ${testng.conf}.xml"/> - - <testng classpathref="run.cp" - outputDir="${testng.report.dir}"> - <xmlfileset dir="${test.resources.dir}" includes="${testng.conf}.xml"/> - </testng> - - <antcall target="clean.tmp"/> - </target> - - - <!-- ==================================================================== --> - <!-- Reports --> - <!-- ==================================================================== --> - - <target name="reports"> - <junitreport todir="${junit.report.dir}"> - <fileset dir="${testng.report.dir}"> - <include name="*.xml"/> - <exclude name="testng-failed.xml"/> - <exclude name="testng-results.xml" /> - </fileset> - <report format="noframes" todir="${junit.report.dir}"/> - </junitreport> - </target> - - - <target name="clean.tmp"> - <delete dir="${test.output.dir}"/> - </target> - - <target name="clean:reports"> - <delete dir="${report.dir}"/> - <delete dir="${junit.report.dir}"/> - </target> - - <target name="clean" depends="clean.tmp,clean:reports"> - <echo message=" -- test clean --"/> - - <delete dir="${test.build.dir}"/> - </target> - - <target name="done"> - <echo>Reports can be found in: open ${testng.report.dir}/index.html</echo> - </target> - -</project> diff --git a/dev-java/testng/files/testng-6.8-remove-ivy-retrieve.patch b/dev-java/testng/files/testng-6.8-remove-ivy-retrieve.patch deleted file mode 100644 index 2d7e91e..0000000 --- a/dev-java/testng/files/testng-6.8-remove-ivy-retrieve.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/build.xml -+++ b/build.xml -@@ -12,7 +12,7 @@ - <!-- ====================================================================== --> - <!-- PREPARE --> - <!-- ====================================================================== --> -- <target name="prepare" depends="retrieve-dependencies" -+ <target name="prepare" - description="Performs all preparations required to build."> - <tstamp /> - <mkdir dir="${build.dir}" /> -@@ -419,10 +419,6 @@ - <!-- Ivy --> - <!-- ==================================================================== --> - -- <target name="retrieve-dependencies" description="Retrieve dependencies with ivy"> -- <ivy:retrieve log="quiet" /> -- </target> -- - <target name="publish"> - <ivy:resolve /> - <mkdir dir="dist/jars" /> diff --git a/dev-java/testng/files/testng-6.8-remove-jar-bundling.patch b/dev-java/testng/files/testng-6.8-remove-jar-bundling.patch deleted file mode 100644 index ca79397..0000000 --- a/dev-java/testng/files/testng-6.8-remove-jar-bundling.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/build.xml -+++ b/build.xml -@@ -73,9 +73,6 @@ - <param name="jar.file" value="${testng.jar}" /> - </antcall> - <jar jarfile="${testng.jar}" update="true"> -- <zipfileset src="${lib.dir}/${beanshell.jar}" /> -- <zipfileset src="${lib.dir}/${jcommander.jar}" /> -- <zipfileset src="${lib.dir}/${yaml.jar}" /> - </jar> - - </target> -@@ -195,10 +192,6 @@ - <param name="jar.file" value="${other.jars.dir}/${testng.junit.jar}" /> - </antcall> - <jar jarfile="${other.jars.dir}/${testng.junit.jar}" update="true"> -- <zipfileset src="${lib.dir}/${beanshell.jar}" /> -- <zipfileset src="${lib.dir}/${jcommander.jar}" /> -- <zipfileset src="${lib.dir}/${junit.jar}" /> -- <zipfileset src="${lib.dir}/${yaml.jar}" /> - </jar> - </target> - -@@ -207,9 +200,6 @@ - <param name="jar.file" value="${other.jars.dir}/${testng.nobsh.guice.jar}" /> - </antcall> - <jar jarfile="${other.jars.dir}/${testng.nobsh.guice.jar}" update="true"> -- <zipfileset src="${lib.dir}/${guice2.jar}" /> -- <zipfileset src="${lib.dir}/${jcommander.jar}" /> -- <zipfileset src="${lib.dir}/${junit.jar}" /> - </jar> - </target> - -@@ -218,9 +208,6 @@ - <param name="jar.file" value="${other.jars.dir}/${testng.bsh.noguice.jar}" /> - </antcall> - <jar jarfile="${other.jars.dir}/${testng.bsh.noguice.jar}" update="true"> -- <zipfileset src="${lib.dir}/${beanshell.jar}" /> -- <zipfileset src="${lib.dir}/${jcommander.jar}" /> -- <zipfileset src="${lib.dir}/${junit.jar}" /> - </jar> - </target> - -@@ -229,8 +216,6 @@ - <param name="jar.file" value="${other.jars.dir}/${testng.nobsh.noguice.jar}" /> - </antcall> - <jar jarfile="${other.jars.dir}/${testng.bsh.noguice.jar}" update="true"> -- <zipfileset src="${lib.dir}/${jcommander.jar}" /> -- <zipfileset src="${lib.dir}/${junit.jar}" /> - </jar> - </target> - -@@ -239,7 +224,6 @@ - <param name="jar.file" value="${other.jars.dir}/${testng.dist.jar}" /> - </antcall> - <jar jarfile="${other.jars.dir}/${testng.dist.jar}" update="true"> -- <zipfileset src="${lib.dir}/${jcommander.jar}" /> - </jar> - </target> - diff --git a/dev-java/testng/testng-6.8-r4.ebuild b/dev-java/testng/testng-6.8-r4.ebuild deleted file mode 100644 index ca20bf6..0000000 --- a/dev-java/testng/testng-6.8-r4.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc examples source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="New generation testing framework in Java" -HOMEPAGE="http://testng.org/"; -SRC_URI="http://${PN}.org/${P}.zip"; - -LICENSE="Apache-2.0" -KEYWORDS="~amd64 ~x86" -SLOT="0" - -CDEPEND=" - dev-java/bsh:0 - dev-java/guice:2 - dev-java/junit:4 - dev-java/ant-core:0 - dev-java/snakeyaml:0 - dev-java/jcommander:0" - -DEPEND=" - ${CDEPEND} - app-arch/zip - >=virtual/jdk-1.6" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.6" - -JAVA_ANT_CLASSPATH_TAGS+=" testng javadocs-current" -JAVA_PKG_BSFIX_NAME="build.xml build-tests.xml" -JAVA_ANT_REWRITE_CLASSPATH="true" -JAVA_ANT_ENCODING="ISO-8859-1" - -EANT_GENTOO_CLASSPATH="ant-core,bsh,guice-2,jcommander,junit-4,snakeyaml-1.9" -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}" - -EANT_BUILD_TARGET="build" -EANT_TEST_TARGET="tests" -EANT_DOC_TARGET="javadocs" - -PATCHES=( - "${FILESDIR}"/${P}-remove-ivy-retrieve.patch - "${FILESDIR}"/${P}-remove-jar-bundling.patch -) - -# Error: A JNI error has occurred, please check your installation and try again. -RESTRICT="test" - -java_prepare() { - java-pkg_clean - - cp "${FILESDIR}"/${P}-build-tests.xml build-tests.xml || die - - epatch "${PATCHES[@]}" - - # Removal of tests that break due to restrictions or environment expectations: - # ServiceLoaderTest - Breaks due absolute URL load that Portage prevents; - # we assume the underlying functionality to work, as - # the underlying functionality is simple and should - # show the usage of this package to break. - sed -i '/test.serviceloader.ServiceLoaderTest/d' src/test/resources/testng.xml || die - - # TrueParallelTest - Doesn't always work, especially not on a system - # under load; since this could fail during parallel - # emerges, we assume the underlying functionality to - # work as it has definitely succeeded under lower load. - sed -i '/test.thread.TrueParallelTest/d' src/test/resources/testng.xml || die - - mkdir lib || die -} - -src_test() { - java-pkg-2_src_test - - local tests_file="target/test-output/index.html" - - if [[ ! -f ${tests_file} ]] ; then - die "Tests failed, test output does not exist; a problem with starting the tests." - fi - - grep 'method-stats.*failed' target/test-output/index.html > /dev/null && \ - die "Tests failed; one or more test failed, see ${tests_file} for more details." -} - -src_install() { - java-pkg_newjar target/${P}.jar - java-pkg_dolauncher ${PN} --main org.testng.TestNG - java-pkg_register-ant-task - - use doc && java-pkg_dojavadoc javadocs - use examples && java-pkg_doexamples examples - use source && java-pkg_dosrc src/main/java/{org,com} -}
