From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Thu, 19 Dec 2019 22:25:35 +0000 (+0100)
Subject: Let all smpi wrapper obey the VERBOSE variable
X-Git-Tag: v3.25~254
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4486ec3290d559d487b2b9edbd4b67b18a4659cc?ds=sidebyside

Let all smpi wrapper obey the VERBOSE variable

When used, they display the real compilation line. That's useful in
particular on debian builders, to have BLHC inspecting the command
line parameters.
---

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index e609cea763..5e0b376e06 100755
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -48,9 +48,6 @@ else
     list_add LINKARGS "-lsimgrid" ${LINKER_UNDEFINED_ERROR:+"-Wl,-z,defs"}
 fi
 
-# By default, we execute the commands instead of only showing them to cmake
-Show=
-
 list_set CMDARGS
 while [ $# -gt 0 ]; do
     ARG="$1"
@@ -84,7 +81,7 @@ while [ $# -gt 0 ]; do
             ;;
 	'-show'|'-compile-info'|'-link-info')
             # Dry run displaying commands instead of executing them. Useful to cmake
-	    Show=echo
+	    show=1
 	    ;;
 	 *)
             list_add CMDARGS "${ARG}"
@@ -100,4 +97,8 @@ list_add_not_empty CMDLINE "${CMDARGS}"
 list_add_not_empty CMDLINE "${LINKARGS}"
 
 eval $(list_get CMDLINE)
-$Show "$@"
+if [ "x$VERBOSE" = x1 -o "x$show" = x1 ] ; then
+  echo "$@"
+  [ "x$show" = x1 ] && exit 0
+fi
+"$@"
diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in
index dafc8806c8..09f156d6f5 100755
--- a/src/smpi/smpicxx.in
+++ b/src/smpi/smpicxx.in
@@ -32,9 +32,6 @@ else
     list_add LINKARGS "@libdir@\libsimgrid.dll"
 fi
 
-# By default, we execute the commands instead of only showing them to cmake
-show=
-
 list_set CMDARGS
 while [ $# -gt 0 ]; do
     ARG="$1"
diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in
index 68928b5faf..e8ff836d8b 100644
--- a/src/smpi/smpif90.in
+++ b/src/smpi/smpif90.in
@@ -41,9 +41,6 @@ filter_and_compile() {
 
 NEEDS_OUTPUT=1
 
-# By default, we execute the commands instead of only showing them to cmake
-Show=
-
 list_set CMDLINE "${REAL_FORTRAN_COMPILER}"
 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
@@ -85,7 +82,7 @@ while [ $# -gt 0 ]; do
             ;;
 	'-show'|'-compile-info'|'-link-info')
             # Dry run displaying commands instead of executing them. Useful to cmake
-	    Show=echo
+	    show=1
 	    ;;
         *)
             list_add CMDLINE "${ARG}"
@@ -102,4 +99,8 @@ list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
 list_add_not_empty CMDLINE "${LINKARGS}"
 
 eval $(list_get CMDLINE)
-$Show "$@"
+if [ "x$VERBOSE" = x1 -o "x$show" = x1 ] ; then
+  echo "$@"
+  [ "x$show" = x1 ] && exit 0
+fi
+"$@"
diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 6b23f7cbd0..8f46902892 100644
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -56,9 +56,6 @@ filter_and_compile_f90() {
 TRACE_CALL_LOCATION=0
 NEEDS_OUTPUT=1
 
-# By default, we execute the commands instead of only showing them to cmake
-Show=
-
 list_set CMDLINE "${REAL_FORTRAN_COMPILER}"
 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
@@ -118,7 +115,7 @@ while [ $# -gt 0 ]; do
             ;;
 	'-show'|'-compile-info'|'-link-info')
             # Dry run displaying commands instead of executing them. Useful to cmake
-	    Show=echo
+	    show=1
 	    ;;
         *)
             list_add CMDLINE "${ARG}"
@@ -135,4 +132,8 @@ list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
 list_add_not_empty CMDLINE "${LINKARGS}"
 
 eval $(list_get CMDLINE)
-$Show "$@"
+if [ "x$VERBOSE" = x1 -o "x$show" = x1 ] ; then
+  echo "$@"
+  [ "x$show" = x1 ] && exit 0
+fi
+"$@"