A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into adrien
[simgrid.git]
/
tools
/
jenkins
/
DynamicAnalysis.sh
diff --git
a/tools/jenkins/DynamicAnalysis.sh
b/tools/jenkins/DynamicAnalysis.sh
index
0d02e89
..
f3e2930
100755
(executable)
--- a/
tools/jenkins/DynamicAnalysis.sh
+++ b/
tools/jenkins/DynamicAnalysis.sh
@@
-7,63
+7,62
@@
die() {
exit 1
}
exit 1
}
-do_cleanup() {
- for d in "$WORKSPACE/build" "$WORKSPACE/memcheck"
+### Check the node installation
+
+pkg_check() {
+ for pkg
do
do
- if
[ -d "$d" ]
+ if
command -v "$pkg"
then
then
- rm -rf "$d" || die "Could not remote $d"
+ echo "$pkg is installed. Good."
+ else
+ die "please install $pkg before proceeding"
fi
done
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
### Cleanup previous runs
-
! [ -z
"$WORKSPACE" ] || die "No WORKSPACE"
+
[ -n
"$WORKSPACE" ] || die "No WORKSPACE"
[ -d "$WORKSPACE" ] || die "WORKSPACE ($WORKSPACE) does not exist"
[ -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
NUMPROC="$(nproc)" || NUMPROC=1
-cd
$WORKSPACE
/build
+cd
"$WORKSPACE"
/build
### Proceed with the tests
ctest -D ExperimentalStart || true
### Proceed with the tests
ctest -D ExperimentalStart || true
-cmake -Denable_documentation=OFF -Denable_lua=OFF \
+cmake -Denable_documentation=OFF -Denable_lua=OFF
-Denable_python=OFF
\
-Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
-Denable_jedule=OFF -Denable_mallocators=OFF \
-Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
-Denable_jedule=OFF -Denable_mallocators=OFF \
- -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=O
N
-Denable_model-checking=OFF \
- -Denable_memcheck_xml=ON
$WORKSPACE
+ -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=O
FF
-Denable_model-checking=OFF \
+ -Denable_memcheck_xml=ON
-DLTO_EXTRA_FLAG="auto" "$WORKSPACE"
-make -j$NUMPROC
+make -j$NUMPROC
tests
ctest --no-compress-output -D ExperimentalTest -j$NUMPROC || true
ctest --no-compress-output -D ExperimentalTest -j$NUMPROC || true
-cd
$WORKSPACE
/build
+cd
"$WORKSPACE"
/build
if [ -f Testing/TAG ] ; then
if [ -f Testing/TAG ] ; then
- find
$WORKSPACE -iname "*.memcheck" -exec mv {} $WORKSPACE
/memcheck \;
+ find
"$WORKSPACE" -iname "*.memcheck" -exec mv {} "$WORKSPACE"
/memcheck \;
#remove all "empty" files
#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
+ grep -r -L "error>"
"$WORKSPACE"
/memcheck | xargs rm -f
+ mv Testing/
"$(head -n 1 < Testing/TAG)"/Test.xml "$WORKSPACE"
/DynamicAnalysis.xml
fi
fi
-