X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4d9b0b89d262961f5a594bfbcb7a1312bcbe43de..77bbf3027c4240a2e833209a3a3f186589da8577:/tools/jenkins/DynamicAnalysis.sh diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh index d7c70ef4dd..53cbde797d 100755 --- a/tools/jenkins/DynamicAnalysis.sh +++ b/tools/jenkins/DynamicAnalysis.sh @@ -20,7 +20,7 @@ do_cleanup() { ### Check the node installation -for pkg in valgrind +for pkg in valgrind pcregrep do if command -v $pkg then @@ -30,7 +30,7 @@ do fi done -### Cleanup previous runs +### Cleanup previous runs ! [ -z "$WORKSPACE" ] || die "No WORKSPACE" [ -d "$WORKSPACE" ] || die "WORKSPACE ($WORKSPACE) does not exist" @@ -46,7 +46,7 @@ NUMPROC="$(nproc)" || NUMPROC=1 cd $WORKSPACE/build -### Proceed with the tests +### Proceed with the tests ctest -D ExperimentalStart || true cmake -Denable_documentation=OFF -Denable_lua=OFF \ @@ -57,11 +57,13 @@ cmake -Denable_documentation=OFF -Denable_lua=OFF \ make -j$NUMPROC -ctest -D ExperimentalTest -j$NUMPROC || true +ctest --no-compress-output -D ExperimentalTest -j$NUMPROC || true cd $WORKSPACE/build if [ -f Testing/TAG ] ; then find $WORKSPACE -iname "*.memcheck" -exec mv {} $WORKSPACE/memcheck \; - mv Testing/`head -n 1 < Testing/TAG`/Test.xml $WORKSPACE/DynamicAnalysis.xml + #remove all "empty" files + grep -r -L "error>" $WORKSPACE/memcheck | xargs rm -f + mv Testing/$(head -n 1 < Testing/TAG)/Test.xml $WORKSPACE/DynamicAnalysis.xml fi