Merge branch 'master' of https://framagit.org/simgrid/simgrid

diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index 5325b9d..a2d7e50 100644 (file)
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -179,7 +179,7 @@ void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, v
   XBT_DEBUG("Copy the data over");
   if(smpi_is_shared(buff, src_private_blocks, &src_offset)) {
     src_private_blocks = shift_and_frame_private_blocks(src_private_blocks, src_offset, buff_size);
-    if (src_private_blocks.size()==1 && (src_private_blocks[0].second - src_private_blocks[0].first)==buff_size){//simple shared malloc ... return.
+    if (src_private_blocks.size()==0){//simple shared malloc ... return.
       XBT_VERB("Sender is shared. Let's ignore it.");
       smpi_cleanup_comm_after_copy(comm, buff);
       return;
@@ -191,7 +191,7 @@ void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, v
   }
   if (smpi_is_shared((char*)comm->dst_buff_, dst_private_blocks, &dst_offset)) {
     dst_private_blocks = shift_and_frame_private_blocks(dst_private_blocks, dst_offset, buff_size);
-    if (src_private_blocks.size()==1 && (src_private_blocks[0].second - src_private_blocks[0].first)==buff_size){//simple shared malloc ... return.
+    if (dst_private_blocks.size()==0){//simple shared malloc ... return.
       XBT_VERB("Receiver is shared. Let's ignore it.");
       smpi_cleanup_comm_after_copy(comm, buff);
       return;

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 65d8628..621d8e8 100755 (executable)
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -80,6 +80,8 @@ elif [ -f /usr/bin/sw_vers ]; then
 elif [ -f /bin/freebsd-version ]; then
     os=$(uname -s)
     ver=$(freebsd-version -u)
+elif [ -f /etc/version ]; then
+    read -r os ver < /etc/release
 elif [ -f /etc/os-release ]; then
     # freedesktop.org and systemd, put last as usually missing useful info
     . /etc/os-release