From 1c72d1539d652edf86282856bff404975dc9a450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Fritze?= <rene.fritze@wwu.de>
Date: Wed, 20 Mar 2019 13:51:33 +0100
Subject: [PATCH] fix test result copy
---
azure-job-template.yml | 6 +++---
test_cpp.bash | 2 +-
test_python.bash | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/azure-job-template.yml b/azure-job-template.yml
index a3d23bd..1f79e5b 100644
--- a/azure-job-template.yml
+++ b/azure-job-template.yml
@@ -36,8 +36,8 @@ jobs:
echo "##vso[task.setvariable variable=docker.image]$IMAGE"
ENV_FILE=${HOME}/env
echo "##vso[task.setvariable variable=docker.env]${ENV_FILE}"
- mkdir ${HOME}/testresults
- DOCKER_RUN="docker run -v ${HOME}/testresults:/home/dune-ci/testresults --env-file ${ENV_FILE} ${IMAGE}"
+ mkdir $(Agent.HomeDirectory)/testresults && chmod -R 777 $(Agent.HomeDirectory)/testresults
+ DOCKER_RUN="docker run -v $(Agent.HomeDirectory)/testresults:/home/dune-ci/testresults --env-file ${ENV_FILE} ${IMAGE}"
echo "##vso[task.setvariable variable=docker.run]${DOCKER_RUN}"
displayName: 'env setup'
@@ -68,5 +68,5 @@ jobs:
- task: PublishTestResults@2
inputs:
testResultsFormat: 'JUnit'
- testResultsFiles: '${HOME}/testresults/*xml'
+ testResultsFiles: '$(Agent.HomeDirectory)/testresults/*xml'
condition: always()
diff --git a/test_cpp.bash b/test_cpp.bash
index e5f8792..3349e04 100755
--- a/test_cpp.bash
+++ b/test_cpp.bash
@@ -28,7 +28,7 @@ CTEST="ctest -V --timeout ${DXT_TEST_TIMEOUT:-300} -j ${DXT_TEST_PROCS:-2}"
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${CTEST}
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} headercheck
-rsync -a ${DUNE_BUILD_DIR}/${MY_MODULE}/dune/xt/*/test/*xml ~/testresults
+cp ${DUNE_BUILD_DIR}/${MY_MODULE}/dune/xt/*/test/*xml ${HOME}/testresults/
# clang coverage currently disabled for being too mem hungry
if [[ ${CC} == *"clang"* ]] ; then
diff --git a/test_python.bash b/test_python.bash
index 5ead770..9d03adf 100755
--- a/test_python.bash
+++ b/test_python.bash
@@ -22,7 +22,7 @@ ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD}
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} bindings
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} test_python
-rsync -a ${DUNE_BUILD_DIR}/${MY_MODULE}/python/pytest_results.xml ~/testresults
+cp ${DUNE_BUILD_DIR}/${MY_MODULE}/python/pytest_results.xml ${HOME}/testresults/
if [ "${SYSTEM_PULLREQUEST_ISFORK}" == "True" ] ; then
echo "Coverage reporting disabled for forked repo/PR"
--
GitLab