You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by dp...@apache.org on 2017/07/05 14:43:47 UTC

[40/50] logging-log4net git commit: Tests: attempt to parse nunit test results with XUnit

Tests: attempt to parse nunit test results with XUnit


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/5ac90ab7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/5ac90ab7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/5ac90ab7

Branch: refs/heads/develop
Commit: 5ac90ab75038da1dcec3c1d060817f919703cf5c
Parents: 759790d
Author: Dominik Psenner <dp...@apache.org>
Authored: Wed Jul 5 15:16:29 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Wed Jul 5 15:16:29 2017 +0200

----------------------------------------------------------------------
 Jenkinsfile      | 14 +++++++++++++-
 tests/nant.build | 22 +++++++++++-----------
 2 files changed, 24 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5ac90ab7/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index aa89136..79359fd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -47,7 +47,19 @@ 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"
-				step([$class: 'NUnitPublisher', testResultsPattern: 'testresults/**/*.xml', debug: false, keepJUnitReports: true, skipJUnitArchiver:false, failIfNoResults: falsee])
+				step([
+					$class        : 'XUnitBuilder',
+					tools         : [
+						[
+							$class               : 'NUnitType',
+							deleteOutputFiles    : false,
+							failIfNotNew         : true,
+							pattern              : 'tests/bin/**/*.xml',
+							skipNoTestFiles      : true,
+							stopProcessingIfError: false
+						]
+					]
+				])
 			}
 		}
 		stage('build net-3.5-cp') {

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5ac90ab7/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index 6255370..7db0cd4 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -789,7 +789,7 @@ 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 failonerror="false">
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration.dir}" />
+            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}" />
             <formatter type="Plain"/>
             <test assemblyname="${current.bin.dir}/log4net.Tests.dll" />
         </nunit2>
@@ -797,7 +797,7 @@ limitations under the License.
 
     <target name="runtests-net-1.1" description="Runs log4net tests on .NET Framework 1.1 version" depends="compile-net-1.1">
         <nunit2 failonerror="false">
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration.dir}" />
+            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}" />
             <formatter type="Plain"/>
             <test assemblyname="${current.bin.dir}/log4net.Tests.dll" />
         </nunit2>
@@ -805,7 +805,7 @@ limitations under the License.
 
     <target name="runtests-net-2.0" description="Runs log4net tests on .NET Framework 2.0 version" depends="compile-net-2.0">
         <nunit2 failonerror="false">
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration.dir}" />
+            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}" />
             <formatter type="Plain"/>
             <test assemblyname="${current.bin.dir}/log4net.Tests.dll" />
         </nunit2>
@@ -813,7 +813,7 @@ limitations under the License.
 
     <target name="runtests-mono-2.0" description="Runs log4net tests on Mono Framework 2.0 version" depends="compile-mono-2.0">
         <nunit2 failonerror="false">
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration.dir}" />
+            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}" />
             <formatter type="Plain"/>
             <test assemblyname="${current.bin.dir}/log4net.Tests.dll" />
         </nunit2>
@@ -821,7 +821,7 @@ limitations under the License.
 
     <target name="runtests-mono-3.5" description="Runs log4net tests on Mono Framework 3.5 version" depends="compile-mono-3.5">
         <nunit2 failonerror="false">
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration.dir}" />
+            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}" />
             <formatter type="Plain"/>
             <test assemblyname="${current.bin.dir}/log4net.Tests.dll" />
         </nunit2>
@@ -829,7 +829,7 @@ limitations under the License.
 
     <target name="runtests-mono-4.0" description="Runs log4net tests on Mono Framework 4.0 version" depends="compile-mono-4.0">
         <nunit2 failonerror="false">
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration.dir}" />
+            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}" />
             <formatter type="Plain"/>
             <test assemblyname="${current.bin.dir}/log4net.Tests.dll" />
         </nunit2>
@@ -837,7 +837,7 @@ limitations under the License.
 
     <target name="runtests-net-3.5" description="Runs log4net tests on .NET Framework 3.5 version" depends="compile-net-3.5">
         <nunit2 failonerror="false">
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration.dir}" />
+            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}" />
             <formatter type="Plain"/>
             <test assemblyname="${current.bin.dir}/log4net.Tests.dll" />
         </nunit2>
@@ -845,7 +845,7 @@ limitations under the License.
 
     <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 failonerror="false">
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration.dir}" />
+            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}" />
             <formatter type="Plain"/>
             <test assemblyname="${current.bin.dir}/log4net.Tests.dll" />
         </nunit2>
@@ -853,7 +853,7 @@ limitations under the License.
 
     <target name="runtests-net-4.0" description="Runs log4net tests on .NET Framework 4.0 version" depends="compile-net-4.0">
         <nunit2 failonerror="false">
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration.dir}" />
+            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}" />
             <formatter type="Plain"/>
             <test assemblyname="${current.bin.dir}/log4net.Tests.dll" />
         </nunit2>
@@ -861,7 +861,7 @@ limitations under the License.
 
     <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 failonerror="false">
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration.dir}" />
+            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}" />
             <formatter type="Plain"/>
             <test assemblyname="${current.bin.dir}/log4net.Tests.dll" />
         </nunit2>
@@ -869,7 +869,7 @@ limitations under the License.
 
     <target name="runtests-net-4.5" description="Runs log4net tests on .NET Framework 4.5 version" depends="compile-net-4.5">
         <nunit2 failonerror="false">
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${log4net.basedir}/testresults/${current.build.configuration.dir}" />
+            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}" />
             <formatter type="Plain"/>
             <test assemblyname="${current.bin.dir}/log4net.Tests.dll" />
         </nunit2>