From: Martin Quinson Date: Fri, 2 Oct 2015 13:22:29 +0000 (+0200) Subject: oops, fix jenkins after moving its conf files X-Git-Tag: v3_12~60 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b8dc71008ef2db758712da42736446d0dba1bd56 oops, fix jenkins after moving its conf files --- diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh index b0f3b59179..89e07a2507 100755 --- a/tools/jenkins/DynamicAnalysis.sh +++ b/tools/jenkins/DynamicAnalysis.sh @@ -88,7 +88,7 @@ ctest -D ExperimentalCoverage || true if [ -f Testing/TAG ] ; then /usr/local/gcovr-3.1/scripts/gcovr -r .. --xml-pretty -o $WORKSPACE/xml_coverage.xml - xsltproc $WORKSPACE/buildtools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_memcheck.xml + xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_memcheck.xml mv CTestResults_memcheck.xml $WORKSPACE fi diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index 9379aef4b8..63bb5835db 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -116,7 +116,7 @@ echo "XX" ctest -T test --output-on-failure --no-compress-output || true if [ -f Testing/TAG ] ; then - xsltproc $WORKSPACE/buildtools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults.xml + xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults.xml mv CTestResults.xml $WORKSPACE fi