From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 22 Nov 2018 15:43:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: v3_22~781
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0e0e1c85bc7b6be4258e3d482d909941368e4e56?hp=0013d87d603e2eb33f659d09ae64e35aaeb880ab

Merge remote-tracking branch 'github/master'
---

diff --git a/examples/s4u/replay-comm/s4u-replay-comm.cpp b/examples/s4u/replay-comm/s4u-replay-comm.cpp
index 9eb3379c11..223fb290db 100644
--- a/examples/s4u/replay-comm/s4u-replay-comm.cpp
+++ b/examples/s4u/replay-comm/s4u-replay-comm.cpp
@@ -30,8 +30,8 @@ class Replayer {
 public:
   explicit Replayer(std::vector<std::string> args)
   {
-    const char* actor_name     = args[0].c_str();
-    const char* trace_filename = args[1].c_str();
+    const char* actor_name     = args.at(0).c_str();
+    const char* trace_filename = args.size() > 1 ? args[1].c_str() : nullptr;
     simgrid::xbt::replay_runner(actor_name, trace_filename);
   }
 
diff --git a/examples/smpi/trace/trace.tesh b/examples/smpi/trace/trace.tesh
index 33df360104..a4752f42e0 100644
--- a/examples/smpi/trace/trace.tesh
+++ b/examples/smpi/trace/trace.tesh
@@ -1347,3 +1347,7 @@ $ rm -f ${bindir:=.}/smpi_trace.trace
 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -trace -trace-resource -trace-file ${bindir:=.}/smpi_trace.trace -hostfile ${srcdir:=.}/../hostfile -platform ${platfdir:=.}/small_platform.xml --cfg=path:${srcdir:=.}/../msg --cfg=smpi/host-speed:1 -np 3 ${bindir:=.}/smpi_trace --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning
 
 $ rm -f ${bindir:=.}/smpi_trace.trace
+
+$ ${bindir:=.}/../../../smpi_script/bin/smpirun -trace --cfg=tracing/smpi/display-sizes:yes --cfg=tracing/smpi/computing:yes --cfg=tracing/smpi/internals:yes -trace-file ${bindir:=.}/smpi_trace.trace -hostfile ${srcdir:=.}/../hostfile -platform ${platfdir:=.}/small_platform.xml --cfg=path:${srcdir:=.}/../msg --cfg=smpi/host-speed:1 -np 3 ${bindir:=.}/smpi_trace --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning
+
+$ rm -f ${bindir:=.}/smpi_trace.trace
diff --git a/src/instr/instr_paje_events.cpp b/src/instr/instr_paje_events.cpp
index 626fba2ed9..aef50ebd2d 100644
--- a/src/instr/instr_paje_events.cpp
+++ b/src/instr/instr_paje_events.cpp
@@ -91,7 +91,7 @@ void StateEvent::print()
       stream_ << " " << value->get_id();
 
     if (TRACE_display_sizes())
-      stream_ << " " << ((extra_ != nullptr) ? extra_->display_size() : 0);
+      stream_ << " " << ((extra_ != nullptr) ? extra_->display_size() : "0");
 
 #if HAVE_SMPI
     if (simgrid::config::get_value<bool>("smpi/trace-call-location")) {
diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in
index dbb5313d4b..fc75375e91 100644
--- a/src/smpi/smpif90.in
+++ b/src/smpi/smpif90.in
@@ -34,7 +34,7 @@ trap 'cleanup' EXIT
 filter_and_compile() {
     list_add TMPFILES "${TMPFILE}"
     #replace "program main_name by subroutine user_main (and the end clause as well)"
-    sed 's/[[:space:]]*[pP][rR][oO][gG][rR][aA][mM][[:space:]][[:space:]]*\([a-zA-Z0-9_]*\)/ subroutine user_main /g' "${ARG}" > "${TMPFILE}"
+    sed 's/^\([[:space:]]*\)\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][^a-zA-Z0-9]*\([a-zA-Z0-9_]*\)/\1\2subroutine user_main /g' "${ARG}" >> "${TMPFILE}"
     SRCFILE="${TMPFILE}"
     list_add CMDLINE "${SRCFILE}"
 }
diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index eeefe89697..3e94eb9921 100644
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -38,7 +38,7 @@ filter_and_compile_f77() {
       echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
       echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
     fi
-    sed 's/[[:space:]]\{6\}[[:space:]]*\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][[:space:]][[:space:]]*\([a-zA-Z0-9_]*\)/      \1subroutine user_main /g' "${ARG}" >> "${TMPFILE}"
+    sed 's/^[[:space:]]\{6\}[[:space:]]*\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][^a-zA-Z0-9]*\([a-zA-Z0-9_]*\)/      \1subroutine user_main /g' "${ARG}" >> "${TMPFILE}"
     SRCFILE="${TMPFILE}"
     list_add CMDLINE "${SRCFILE}"
 }
@@ -49,7 +49,7 @@ filter_and_compile_f90() {
       echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
       echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
     fi
-    sed 's/[[:space:]]*[pP][rR][oO][gG][rR][aA][mM][[:space:]][[:space:]]*\([a-zA-Z0-9_]*\)/ subroutine user_main /g' "${ARG}" > "${TMPFILE}"
+    sed 's/^\([[:space:]]*\)\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][^a-zA-Z0-9]*\([a-zA-Z0-9_]*\)/\1\2subroutine user_main /g' "${ARG}" >> "${TMPFILE}"
     SRCFILE="${TMPFILE}"
     list_add CMDLINE "${SRCFILE}"
 }
diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 951e7440c2..59bbf3ac22 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -125,6 +125,13 @@ case "$build_mode" in
   ;;
 esac
 
+if [ "$2" = "" ]; then
+  branch_name="unknown"
+else
+  branch_name="$2"
+fi
+echo "Branch built is $branch_name"
+
 NUMBER_OF_PROCESSORS="$(nproc)" || NUMBER_OF_PROCESSORS=1
 GENERATOR="Unix Makefiles"
 
@@ -210,7 +217,7 @@ if [ -f Testing/TAG ] ; then
    mv CTestResults.xml $WORKSPACE
 fi
 
-if test -n "$INSTALL"; then
+if test -n "$INSTALL" && [ ${branch_name} = "origin/master" ] ; then
   echo "XX"
   echo "XX Test done. Install everything since it's a regular build, not on a Windows."
   echo "XX"