summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/testng/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/testng/files')
-rw-r--r--dev-java/testng/files/build-tests.xml188
-rw-r--r--dev-java/testng/files/testng-6.8-build-tests.xml188
-rw-r--r--dev-java/testng/files/testng-6.8-remove-ivy-retrieve.patch22
-rw-r--r--dev-java/testng/files/testng-6.8-remove-jar-bundling.patch60
4 files changed, 458 insertions, 0 deletions
diff --git a/dev-java/testng/files/build-tests.xml b/dev-java/testng/files/build-tests.xml
new file mode 100644
index 000000000000..e94606b60cea
--- /dev/null
+++ b/dev-java/testng/files/build-tests.xml
@@ -0,0 +1,188 @@
+<!-- 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-build-tests.xml b/dev-java/testng/files/testng-6.8-build-tests.xml
new file mode 100644
index 000000000000..e94606b60cea
--- /dev/null
+++ b/dev-java/testng/files/testng-6.8-build-tests.xml
@@ -0,0 +1,188 @@
+<!-- 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
new file mode 100644
index 000000000000..2d7e91e74587
--- /dev/null
+++ b/dev-java/testng/files/testng-6.8-remove-ivy-retrieve.patch
@@ -0,0 +1,22 @@
+--- 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
new file mode 100644
index 000000000000..ca793971c73a
--- /dev/null
+++ b/dev-java/testng/files/testng-6.8-remove-jar-bundling.patch
@@ -0,0 +1,60 @@
+--- 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>
+