From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 27 Jul 2015 19:31:08 +0000 (+0200)
Subject: Merge branches 'master' and 'master' of github.com:mquinson/simgrid
X-Git-Tag: v3_12~363
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5cfdc1e82665701689093c752ad0f2de8f542ad0?hp=d55c8677cb3a2fde6aa61426092f958338c6c042

Merge branches 'master' and 'master' of github.com:mquinson/simgrid
---

diff --git a/buildtools/jenkins/build.sh b/buildtools/jenkins/build.sh
index eb87979fd9..b0ac127e84 100755
--- a/buildtools/jenkins/build.sh
+++ b/buildtools/jenkins/build.sh
@@ -2,10 +2,23 @@
 
 set -e
 
-echo "Running $0 with arguments:" >&2
-for arg in "$@"; do
-  echo "- $arg"
-done
+# usage: die status message...
+die () {
+  local status=${1:-1}
+  shift
+  [ $# -gt 0 ] || set -- "Error - Halting"
+  echo "$@" >&2
+  exit $status
+}
+
+# Get an ON/OFF string from a command:
+onoff() {
+  if "$@" > /dev/null ; then
+    echo ON
+  else
+    echo OFF
+  fi
+}
 
 build_mode="$1"
 echo "Build mode $build_mode on $(uname -np)" >&2
@@ -20,13 +33,7 @@ case "$build_mode" in
   ;;
 
   *)
-    if test "$(uname -o)" = "Msys"; then
-      echo "On Windows, jenkins is not willing to expand variables for some reason" >&2
-      echo "Force use Debug mode" >&2
-    else
-      echo "Unknown build_mode $build_mode"
-      exit 1
-    fi
+    die 1 "Unknown build_mode $build_mode"
   ;;
 esac
 
@@ -40,24 +47,6 @@ else
   GENERATOR="Unix Makefiles"
 fi
 
-# usage: die status message...
-die () {
-  local status=${1:-1}
-  shift
-  [ $# -gt 0 ] || set -- "Error - Halting"
-  echo "$@" >&2
-  exit $status
-}
-
-# Get an ON/OFF string from a command:
-onoff() {
-  if "$@" > /dev/null ; then
-    echo ON
-  else
-    echo OFF
-  fi
-}
-
 ulimit -c 0 || true
 
 if [ -d $WORKSPACE/build ]
@@ -75,7 +64,7 @@ cd `cat VERSION`
 cmake -G"$GENERATOR"\
   -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
   -Denable_model-checking=$(onoff test "$build_mode" = "ModelChecker") \
-  -Denable_compile_optimization=$(onoff test "$build_mode" = "Debug") \
+  -Denable_compile_optimizations=$(onoff test "$build_mode" = "Debug") \
   -Denable_smpi_MPICH3_testsuite=$(onoff test "$build_mode" != "DynamicAnalysis") \
   -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
   -Denable_mallocators=$(onoff test "$build_mode" != "DynamicAnalysis") \
diff --git a/contrib/psg/src/psgsim/PSGSimulator.java b/contrib/psg/src/psgsim/PSGSimulator.java
index 4d45d4e438..cd60973b3d 100644
--- a/contrib/psg/src/psgsim/PSGSimulator.java
+++ b/contrib/psg/src/psgsim/PSGSimulator.java
@@ -85,8 +85,9 @@ public class PSGSimulator {
 
 		/** Process Controller **/
 		PSGPlatform.control();
-		new PSGProcessController(PSGPlatform.hostList[0],
-				PSGPlatform.hostList[0].getName(), null).start();
+		if (!PSGPlatform.controlStepMap.isEmpty())
+			new PSGProcessController(PSGPlatform.hostList[0],
+					PSGPlatform.hostList[0].getName(), null).start();
 
 		/** Load and execute the initializers classes in the configuration file **/
 		PSGPlatform.init();
diff --git a/contrib/psg/tutorial.pdf b/contrib/psg/tutorial.pdf
index 591649f7d1..faf141bbf1 100644
Binary files a/contrib/psg/tutorial.pdf and b/contrib/psg/tutorial.pdf differ
diff --git a/teshsuite/bug-17132/CMakeLists.txt b/teshsuite/bug-17132/CMakeLists.txt
index aeaae90d8d..3f46bf102b 100644
--- a/teshsuite/bug-17132/CMakeLists.txt
+++ b/teshsuite/bug-17132/CMakeLists.txt
@@ -13,26 +13,26 @@ if(enable_smpi)
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   add_executable(bug-17132 ${CMAKE_HOME_DIRECTORY}/teshsuite/bug-17132/bug-17132.c)
   target_link_libraries(bug-17132 simgrid)
+endif(enable_smpi)
 
-  set(tesh_files
-    ${tesh_files}
-    ${CMAKE_CURRENT_SOURCE_DIR}/bug-17132.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/bug-17132-surf-debug.tesh
-    PARENT_SCOPE)
-  set(xml_files
-    ${xml_files}
-    PARENT_SCOPE)
-  set(teshsuite_src
-    ${teshsuite_src}
-    ${CMAKE_CURRENT_SOURCE_DIR}/bug-17132.c
-    PARENT_SCOPE)
-  set(bin_files
-    ${bin_files}
-    PARENT_SCOPE)
-  set(txt_files
-    ${txt_files}
-    ${CMAKE_CURRENT_SOURCE_DIR}/hostfile.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/README
-    PARENT_SCOPE)
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/bug-17132.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/bug-17132-surf-debug.tesh
+  PARENT_SCOPE)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE)
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/bug-17132.c
+  PARENT_SCOPE)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE)
+set(txt_files
+  ${txt_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/hostfile.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/README
+  PARENT_SCOPE)
 
-endif(enable_smpi)