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
sonar: don't catch exception that we don't handle
[simgrid.git]
/
BuildSimGrid.sh
diff --git
a/BuildSimGrid.sh
b/BuildSimGrid.sh
index 472e93734a03f33b1a51afd07a6c659ffebc369c..526f3f09f453af7abf4c2e0d9ded9c07903932f5 100755
(executable)
--- a/
BuildSimGrid.sh
+++ b/
BuildSimGrid.sh
@@
-6,21
+6,25
@@
# Copyright (c) 2017-2019 The SimGrid Team. Licence: LGPL of WDFPL, as you want.
if [ ! -e Makefile ] ; then
# Copyright (c) 2017-2019 The SimGrid Team. Licence: LGPL of WDFPL, as you want.
if [ ! -e Makefile ] ; then
- echo "Please configure SimGrid before building it:"
- echo " ccmake ."
- exit 1
+ if [ -e build/default/Makefile ] ; then
+ cd build/default
+ else
+ echo "Please configure SimGrid before building it:"
+ echo " ccmake ."
+ exit 1
+ fi
fi
target=tests
install_path=$(sed -n 's/^CMAKE_INSTALL_PREFIX:PATH=//p' CMakeCache.txt)
fi
target=tests
install_path=$(sed -n 's/^CMAKE_INSTALL_PREFIX:PATH=//p' CMakeCache.txt)
-if [ -e ${install_path} -a -d ${install_path} -a -x ${install_path} ] ; then
+if [ -e ${install_path} -a -d ${install_path} -a -x ${install_path}
-a -w ${install_path}
] ; then
target=install
fi
(
echo "install_path: ${install_path}"
echo "Target: ${target}"
target=install
fi
(
echo "install_path: ${install_path}"
echo "Target: ${target}"
- (nice make -j4 ${target}
|| make
) && nice ctest -j4 --output-on-failure ; date
+ (nice make -j4 ${target}
tests || make ${target} tests
) && nice ctest -j4 --output-on-failure ; date
) 2>&1 | tee BuildSimGrid.sh.log
) 2>&1 | tee BuildSimGrid.sh.log
-exit 0
+