Tests: generated test files should now be stored in a place where jenkins expects them
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/988ee03d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/988ee03d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/988ee03d Branch: refs/heads/feature/RollingFileAppender-NG Commit: 988ee03da07eeee551fbee710edd25bc23f730a8 Parents: 9656725 Author: Dominik Psenner <[email protected]> Authored: Tue Jul 4 18:06:31 2017 +0200 Committer: Dominik Psenner <[email protected]> Committed: Tue Jul 4 18:06:31 2017 +0200 ---------------------------------------------------------------------- Jenkinsfile | 10 +++++----- tests/nant.build | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/988ee03d/Jenkinsfile ---------------------------------------------------------------------- diff --git a/Jenkinsfile b/Jenkinsfile index c810c36..9409b7a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,7 +47,7 @@ pipeline { bat "${NANT_BIN} -t:net-3.5 -buildfile:log4net.build compile-net-3.5" stash includes: 'bin/**/*.*', name: 'net-3.5-assemblies' bat "${NANT_BIN} -t:net-3.5 -buildfile:tests/nant.build runtests-net-3.5 && exit 0" - archive 'tests/**/results/*.xml' + junit 'testresults/**/*.xml' } } stage('build net-3.5-cp') { @@ -61,7 +61,7 @@ pipeline { bat "${NANT_BIN} -t:net-3.5 -buildfile:log4net.build compile-net-3.5-cp" stash includes: 'bin/**/*.*', name: 'net-3.5-cp-assemblies' bat "${NANT_BIN} -t:net-3.5 -buildfile:tests/nant.build runtests-net-3.5-cp && exit 0" - archive 'tests/**/results/*.xml' + junit 'testresults/**/*.xml' } } stage('build net-4.0') { @@ -75,7 +75,7 @@ pipeline { bat "${NANT_BIN} -t:net-4.0 -buildfile:log4net.build compile-net-4.0" stash includes: 'bin/**/*.*', name: 'net-4.0-assemblies' bat "${NANT_BIN} -t:net-4.0 -buildfile:tests/nant.build runtests-net-4.0 && exit 0" - archive 'tests/**/results/*.xml' + junit 'testresults/**/*.xml' } } stage('build net-4.0-cp') { @@ -89,7 +89,7 @@ pipeline { bat "${NANT_BIN} -t:net-4.0 -buildfile:log4net.build compile-net-4.0-cp" stash includes: 'bin/**/*.*', name: 'net-4.0-cp-assemblies' bat "${NANT_BIN} -t:net-4.0 -buildfile:tests/nant.build runtests-net-4.0-cp && exit 0" - archive 'tests/**/results/*.xml' + junit 'testresults/**/*.xml' } } stage('build net-4.5') { @@ -103,7 +103,7 @@ pipeline { bat "${NANT_BIN} -t:net-4.0 -buildfile:log4net.build compile-net-4.5" stash includes: 'bin/**/*.*', name: 'net-4.5-assemblies' bat "${NANT_BIN} -t:net-4.0 -buildfile:tests/nant.build runtests-net-4.5 && exit 0" - archive 'tests/**/results/*.xml' + junit 'testresults/**/*.xml' } } stage('build mono-2.0') { http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/988ee03d/tests/nant.build ---------------------------------------------------------------------- diff --git a/tests/nant.build b/tests/nant.build index f787bf5..4e153ed 100644 --- a/tests/nant.build +++ b/tests/nant.build @@ -789,77 +789,77 @@ limitations under the License. <target name="runtests-net-1.0" description="Runs log4net tests on .NET Framework 1.0 version" depends="compile-net-1.0"> <nunit2> - <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" /> + <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration}" /> <test assemblyname="${current.bin.dir}/log4net.Tests.dll" /> </nunit2> </target> <target name="runtests-net-1.1" description="Runs log4net tests on .NET Framework 1.1 version" depends="compile-net-1.1"> <nunit2> - <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" /> + <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration}" /> <test assemblyname="${current.bin.dir}/log4net.Tests.dll" /> </nunit2> </target> <target name="runtests-net-2.0" description="Runs log4net tests on .NET Framework 2.0 version" depends="compile-net-2.0"> <nunit2> - <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" /> + <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration}" /> <test assemblyname="${current.bin.dir}/log4net.Tests.dll" /> </nunit2> </target> <target name="runtests-mono-2.0" description="Runs log4net tests on Mono Framework 2.0 version" depends="compile-mono-2.0"> <nunit2> - <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" /> + <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration}" /> <test assemblyname="${current.bin.dir}/log4net.Tests.dll" /> </nunit2> </target> <target name="runtests-mono-3.5" description="Runs log4net tests on Mono Framework 3.5 version" depends="compile-mono-3.5"> <nunit2> - <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" /> + <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration}" /> <test assemblyname="${current.bin.dir}/log4net.Tests.dll" /> </nunit2> </target> <target name="runtests-mono-4.0" description="Runs log4net tests on Mono Framework 4.0 version" depends="compile-mono-4.0"> <nunit2> - <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" /> + <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration}" /> <test assemblyname="${current.bin.dir}/log4net.Tests.dll" /> </nunit2> </target> <target name="runtests-net-3.5" description="Runs log4net tests on .NET Framework 3.5 version" depends="compile-net-3.5"> <nunit2> - <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" /> + <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration}" /> <test assemblyname="${current.bin.dir}/log4net.Tests.dll" /> </nunit2> </target> <target name="runtests-net-3.5-cp" description="Runs log4net tests on .NET Framework 3.5 Client Profile version" depends="compile-net-3.5-cp"> <nunit2> - <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" /> + <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration}" /> <test assemblyname="${current.bin.dir}/log4net.Tests.dll" /> </nunit2> </target> <target name="runtests-net-4.0" description="Runs log4net tests on .NET Framework 4.0 version" depends="compile-net-4.0"> <nunit2> - <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" /> + <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration}" /> <test assemblyname="${current.bin.dir}/log4net.Tests.dll" /> </nunit2> </target> <target name="runtests-net-4.0-cp" description="Runs log4net tests on .NET Framework 4.0 Client Profile version" depends="compile-net-4.0-cp"> <nunit2> - <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" /> + <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration}" /> <test assemblyname="${current.bin.dir}/log4net.Tests.dll" /> </nunit2> </target> <target name="runtests-net-4.5" description="Runs log4net tests on .NET Framework 4.5 version" depends="compile-net-4.5"> <nunit2> - <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" /> + <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration}" /> <test assemblyname="${current.bin.dir}/log4net.Tests.dll" /> </nunit2> </target>
