[checkmk-commits] Windows: write junit.xml in bindir

Module: check_mk Branch: master Commit: 0f406897b93247aca37f7755aec6096de7cf2557 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f406897b93247… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Jan 26 10:18:33 2018 +0100 Windows: write junit.xml in bindir Jenkins needs to copy it from there to its workspace as workspace dir is not mounted in chroot. --- agents/windows/.gitignore | 2 +- agents/windows/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/.gitignore b/agents/windows/.gitignore index 601cf2b..72a756e 100644 --- a/agents/windows/.gitignore +++ b/agents/windows/.gitignore @@ -19,4 +19,4 @@ chroot *.exe *.msi Makefile.in - +junit.xml diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index c996ec7..0245aa1 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -17,7 +17,7 @@ wmitest_LDADD = $(LD_COMMON) pytest = /usr/bin/env pytest pytest_options = --maxfail=10 -pytest_jenkins = $(pytest_options) --junitxml=$$WORKSPACE/results/junit.xml +pytest_jenkins = $(pytest_options) --junitxml=$(bindir)/junit.xml build_version: $(check_mk_agent_SOURCES:.cc=.o) echo $$(( $$(cat $(VPATH)/build_version) + 1 )) > $(VPATH)/build_version