X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/65a7a10e6d1e5aaddaabfe7e68af9a6b21769772..92cbaa683aa7824d7ad1b7f1702dec27e1c6eefb:/BuildSimGrid.sh

diff --git a/BuildSimGrid.sh b/BuildSimGrid.sh
index e42d186a4c..526f3f09f4 100755
--- a/BuildSimGrid.sh
+++ b/BuildSimGrid.sh
@@ -3,24 +3,28 @@
 # This little script rebuilds and runs the SimGrid archive in parallel, extracting a log
 # This is almost an internal script, but others may find this useful
 #
-# Copyright (c) 2017-2018 The SimGrid Team. Licence: LGPL of WDFPL, as you want.
+# 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=all
+target=tests
 
-install_path=`grep ^CMAKE_INSTALL_PREFIX:PATH= CMakeCache.txt|sed 's/^[^=]*=//'`
-if [ -e ${install_path} -a -d ${install_path} -a -x ${install_path} ] ; then
+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
   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
-exit 0
+