X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/285360d3a869f4b2492c3d36b3d373f2cf6be08f..1c10206dfec917be0f5b3f4964f82b0c959436e2:/buildtools/scripts/test_dist_with_cmake.sh?ds=sidebyside

diff --git a/buildtools/scripts/test_dist_with_cmake.sh b/buildtools/scripts/test_dist_with_cmake.sh
index 034be4526f..124dc1917a 100755
--- a/buildtools/scripts/test_dist_with_cmake.sh
+++ b/buildtools/scripts/test_dist_with_cmake.sh
@@ -2,21 +2,33 @@
 # This script waits that the make_dist script finishes building the right archive in ~/simgrid
 # and then builds it using cmake. Warning, cmake is only a wrapper for now, you still need the autotools
 
+if [ -e ~/simgrid-svn/buildtools/scripts/simgrid_build.conf ] ; then
+  source ~/simgrid-svn/buildtools/scripts/simgrid_build.conf
+else
+  source ~/.simgrid_build.conf
+fi
 
-source ~/simgrid-svn/buildtools/scripts/simgrid_build.conf
-
+set -e
+get_version
 open_archive
 
 # Make sure we have cmake installed
-which_cmake=`which cmake` 
+which_cmake=`which cmake 2>/dev/null`
 if [ x$which_cmake = x ] ; then
   echo "Try to install cmake"
-  sudo apt-get install cmake
+  if [ -e /usr/bin/apt-get ] ; then # debian based
+    sudo apt-get install cmake
+  fi
+  if [ -e /usr/bin/yum ] ; then # fedora based
+    sudo yum update
+    sudo yum -y install cmake
+  fi
 fi
 
 # Launch CMake
 cd buildtools/Cmake
+echo $version > version
 cmake ./
 
 # Run CTest, and push the results
-ctest -D Experimental CTEST_FULL_OUTPUT
+ctest -D Experimental