cleanups after introduction of Exec::wait_for(timeout)

[simgrid.git] / BuildSimGrid.sh

diff --git a/BuildSimGrid.sh b/BuildSimGrid.sh
index 3e74ec2..4bb2f7a 100755 (executable)
--- a/BuildSimGrid.sh
+++ b/BuildSimGrid.sh
@@ -5,7 +5,7 @@
 #
 # Copyright (c) 2017-2019 The SimGrid Team. Licence: LGPL of WDFPL, as you want.
 
-if [ ! -e Makefile ] ; then
+if [ ! -e Makefile ] ; then
   if [ -e build/default/Makefile ] ; then
     cd build/default
   else
@@ -18,7 +18,7 @@ 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} -a -w ${install_path} ] ; then
+if [ -e ${install_path} ] && [ -d ${install_path} ] && [ -x ${install_path} ] && [ -w ${install_path} ] ; then
   target=install
 fi
 
@@ -27,4 +27,4 @@ fi
   echo "Target: ${target}"
   (nice make -j4 ${target} tests || make ${target} tests) && nice ctest -j4 --output-on-failure ; date
 ) 2>&1 | tee BuildSimGrid.sh.log
-exit 0
+