X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dce51a171761c0f221ee10beecf3f9ead9bbb627..9154f5e4e00fdd0ed3ea750235f245f85b813b18:/tools/jenkins/DynamicAnalysis.sh

diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh
index 04fe409694..e28143ccc2 100755
--- a/tools/jenkins/DynamicAnalysis.sh
+++ b/tools/jenkins/DynamicAnalysis.sh
@@ -7,40 +7,40 @@ die() {
     exit 1
 }
 
-do_cleanup() {
-  for d in "$WORKSPACE/build" "$WORKSPACE/memcheck"
+### Check the node installation
+
+pkg_check() {
+  for pkg
   do
-    if [ -d "$d" ]
+    if command -v $pkg
     then
-      rm -rf "$d" || die "Could not remote $d"
+       echo "$pkg is installed. Good."
+    else
+       die "please install $pkg before proceeding"
     fi
   done
-  find $WORKSPACE -name "memcheck_test_*.memcheck" -exec rm {} \;
 }
 
-### Check the node installation
-
-for pkg in valgrind pcregrep
-do
-   if command -v $pkg
-   then
-      echo "$pkg is installed. Good."
-   else
-      die "please install $pkg before proceeding"
-   fi
-done
+pkg_check valgrind pcregrep
 
 ### Cleanup previous runs
 
 ! [ -z "$WORKSPACE" ] || die "No WORKSPACE"
 [ -d "$WORKSPACE" ] || die "WORKSPACE ($WORKSPACE) does not exist"
 
-do_cleanup
+do_cleanup() {
+  for d
+  do
+    if [ -d "$d" ]
+    then
+      rm -rf "$d" || die "Could not remove $d"
+    fi
+    mkdir "$d" || die "Could not create $d"
+  done
+  find $WORKSPACE -name "memcheck_test_*.memcheck" -exec rm {} \;
+}
 
-for d in "$WORKSPACE/build" "$WORKSPACE/memcheck"
-do
-  mkdir "$d" || die "Could not create $d"
-done
+do_cleanup "$WORKSPACE/build" "$WORKSPACE/memcheck"
 
 NUMPROC="$(nproc)" || NUMPROC=1