From 2e20d073d6a56b5840f6198b91a5983b1c3ef7cb Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 9 Mar 2018 22:21:52 +0100
Subject: [PATCH 1/1] still trying to test the tuto

This time, instead of trying to use the installed version of Jenkins,
I try to fix the provided Makefile so that it works without installing.
---
 doc/tuto-msg/Makefile   |  6 +++---
 tools/cmake/Tests.cmake | 23 +++++++++++------------
 tools/jenkins/build.sh  |  1 -
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/doc/tuto-msg/Makefile b/doc/tuto-msg/Makefile
index 147e42f62d..665ba9c464 100644
--- a/doc/tuto-msg/Makefile
+++ b/doc/tuto-msg/Makefile
@@ -5,7 +5,7 @@
 
 # Some configuration
 SIMGRID_INSTALL_PATH ?= ../.. # Where you installed simgrid 
-CC = gcc                            # Your compiler (on Mac, use clang instead)
+CC ?= gcc                     # Your compiler (on Mac, use clang instead)
 
 # No change needed bellow for this tutorial.
 ############################################################################
@@ -19,8 +19,8 @@ WARNING = -Wshadow -Wcast-align -Waggregate-return -Wmissing-prototypes \
 	  -Wnested-externs -Wpointer-arith -Wwrite-strings
 WARNING += -Werror # Comment that line to not be in paranoid mode
 
-# CFLAGS = -std=gnu99 -g -O0 $(WARNINGS) # Use this line to make debugging easier
-CFLAGS = -std=gnu99 -g -O2 $(WARNINGS) # Use this line to get better performance
+# CFLAGS = -std=gnu99 -g -O0 $(WARNINGS) $(EXTRA_CFLAGS) # Use this line to make debugging easier
+CFLAGS = -std=gnu99 -g -O2 $(WARNINGS) $(EXTRA_CFLAGS) # Use this line to get better performance
 
 # No change should be mandated past that line
 #############################################
diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 7bec95da70..242b63e29f 100644
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -99,16 +99,15 @@ else()
 endif()
 
 # 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")
-  ADD_TEST(tuto-msg-3 sh -c "make -C ${CMAKE_SOURCE_DIR}/doc/tuto-msg masterworker-sol3 && ${CMAKE_SOURCE_DIR}/doc/tuto-msg/masterworker-sol3 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${CMAKE_SOURCE_DIR}/doc/tuto-msg/deployment3.xml")
-  ADD_TEST(tuto-msg-4 sh -c "make -C ${CMAKE_SOURCE_DIR}/doc/tuto-msg masterworker-sol4 && ${CMAKE_SOURCE_DIR}/doc/tuto-msg/masterworker-sol4 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${CMAKE_SOURCE_DIR}/doc/tuto-msg/deployment3.xml")
+set(tuto-path "${CMAKE_SOURCE_DIR}/doc/tuto-msg")
+set(tuto-make "make -C ${tuto-path} CC=${CMAKE_C_COMPILER} EXTRA_CFLAGS=-I${CMAKE_HOME_DIRECTORY}")
+ADD_TEST(tuto-msg-0 sh -c "${tuto-make} masterworker      && ${tuto-path}/masterworker      ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment0.xml")
+ADD_TEST(tuto-msg-1 sh -c "${tuto-make} masterworker-sol1 && ${tuto-path}/masterworker-sol1 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment1.xml")
+ADD_TEST(tuto-msg-2 sh -c "${tuto-make} masterworker-sol2 && ${tuto-path}/masterworker-sol2 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment2.xml")
+ADD_TEST(tuto-msg-3 sh -c "${tuto-make} masterworker-sol3 && ${tuto-path}/masterworker-sol3 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment3.xml")
+ADD_TEST(tuto-msg-4 sh -c "${tuto-make} masterworker-sol4 && ${tuto-path}/masterworker-sol4 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment3.xml")
 
-  FOREACH(TUTOTEST tuto-msg-0 tuto-msg-1 tuto-msg-2 tuto-msg-3 tuto-msg-4)
-    SET_TESTS_PROPERTIES(${TUTOTEST} 
-                         PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib")
-  ENDFOREACH()
-endif()
+FOREACH(TUTOTEST tuto-msg-0 tuto-msg-1 tuto-msg-2 tuto-msg-3 tuto-msg-4)
+SET_TESTS_PROPERTIES(${TUTOTEST} 
+                     PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib")
+ENDFOREACH()
diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 0873ca636a..bf88895307 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -126,7 +126,6 @@ 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 \
-- 
2.20.1