X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f28ca3e842418032d26698ec5ed2dace6f95e961..ba404620ba1ee7677e7bfa5b13b8f4e6bab10e3b:/tools/jenkins/DynamicAnalysis.sh diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh index 3a589499d0..0d02e89a04 100755 --- a/tools/jenkins/DynamicAnalysis.sh +++ b/tools/jenkins/DynamicAnalysis.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -e @@ -23,14 +23,14 @@ do_cleanup() { for pkg in valgrind pcregrep do if command -v $pkg - then + then echo "$pkg is installed. Good." - else - die "please install $pkg before proceeding" + else + die "please install $pkg before proceeding" 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,13 +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 \; #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 + mv Testing/$(head -n 1 < Testing/TAG)/Test.xml $WORKSPACE/DynamicAnalysis.xml fi