yet another attempt at testing the tuto on jenkins

diff --git a/doc/tuto-msg/Makefile b/doc/tuto-msg/Makefile
index 8340d92..147e42f 100644 (file)
--- a/doc/tuto-msg/Makefile
+++ b/doc/tuto-msg/Makefile
@@ -4,7 +4,7 @@
 # http://simgrid.gforge.inria.fr/simgrid/latest/doc/install_yours.html
 
 # Some configuration
-SIMGRID_INSTALL_PATH = ../.. # Where you installed simgrid 
+SIMGRID_INSTALL_PATH ?= ../.. # Where you installed simgrid 
 CC = gcc                            # Your compiler (on Mac, use clang instead)
 
 # No change needed bellow for this tutorial.

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 5ebe498..7bec95d 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -98,8 +98,9 @@ else()
   set(EXTRA_DIST       ${EXTRA_DIST}       src/surf/trace_mgr_test.cpp)
 endif()
 
-# Also test the tutorial
-if(CMAKE_COMPILER_IS_GNUCC)
+# Also test the tutorial, if SIMGRID_INSTALL_PATH is defined and gcc used
+if(CMAKE_COMPILER_IS_GNUCC AND
+   (NOT "${SIMGRID_INSTALL_PATH}" STREQUAL ""))
   ADD_TEST(tuto-msg-0 sh -c "make -C ${CMAKE_SOURCE_DIR}/doc/tuto-msg masterworker      && ${CMAKE_SOURCE_DIR}/doc/tuto-msg/masterworker      ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${CMAKE_SOURCE_DIR}/doc/tuto-msg/deployment0.xml")
   ADD_TEST(tuto-msg-1 sh -c "make -C ${CMAKE_SOURCE_DIR}/doc/tuto-msg masterworker-sol1 && ${CMAKE_SOURCE_DIR}/doc/tuto-msg/masterworker-sol1 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${CMAKE_SOURCE_DIR}/doc/tuto-msg/deployment1.xml")
   ADD_TEST(tuto-msg-2 sh -c "make -C ${CMAKE_SOURCE_DIR}/doc/tuto-msg masterworker-sol2 && ${CMAKE_SOURCE_DIR}/doc/tuto-msg/masterworker-sol2 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${CMAKE_SOURCE_DIR}/doc/tuto-msg/deployment2.xml")

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index bf88895..0873ca6 100755 (executable)
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -126,6 +126,7 @@ echo "XX Configure and build SimGrid"
 echo "XX   pwd: "$(pwd)
 echo "XX"
 set -x
+export SIMGRID_INSTALL_PATH=/builds/simgrid_install
 cmake -G"$GENERATOR"\
   -DCMAKE_INSTALL_PREFIX=/builds/simgrid_install \
   -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \