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 2018/05/20 10:39:16 UTC

logging-log4net git commit: netstandard-1.3: align test results and log locations with the pattern of other targets

Repository: logging-log4net
Updated Branches:
  refs/heads/feature/cd-pipeline cd9866d66 -> b402cc856


netstandard-1.3: align test results and log locations with the pattern of other targets


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

Branch: refs/heads/feature/cd-pipeline
Commit: b402cc856d783f520febe601533430f9233ffee2
Parents: cd9866d
Author: Dominik Psenner <dp...@apache.org>
Authored: Sun May 20 12:38:11 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sun May 20 12:38:11 2018 +0200

----------------------------------------------------------------------
 Jenkinsfile      |  4 ++--
 tests/nant.build | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b402cc85/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index d4bf538..9d53023 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -64,8 +64,8 @@ pipeline {
 
 						// test
 						sh "nant -buildfile:tests/nant.build runtests-netstandard-1.3"
-						stash includes: '**/*.trx', name: 'netstandard-1.3-testresults', allowEmpty: true
-						stash includes: '**/*.log', name: 'netstandard-1.3-testlogs', allowEmpty: true
+						stash includes: 'tests/bin/**/*.trx', name: 'netstandard-1.3-testresults', allowEmpty: true
+						stash includes: 'tests/bin/**/*.log', name: 'netstandard-1.3-testlogs', allowEmpty: true
 					}
 				}
 			}

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b402cc85/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index 914e7b2..346ebca 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -872,7 +872,15 @@ limitations under the License.
             <arg value="-d"/>
             <arg value="test.diagnostics.log"/>
             <arg value="log4net.tests/log4net.tests.csproj" />
-        </exec>
+		</exec>
+		<!-- move netstandard/1.3 to tests/bin/netstandard/1.3 -->
+		<move todir="tests/bin/netstandard/1.3/"
+			  failonerror="false">
+			<fileset basedir="netstandard/1.3">
+				<include name="**/*.log" />
+				<include name="**/*.trx" />
+			</fileset>
+		</move>
     </target>
 
 </project>