printing timestamp with the full list of arguments in a safe way (ATLINFR-2731)

9cba9f4c · Oleg Zenin · c6a7f5b4 · 9cba9f4c · 9cba9f4c · 9cba9f4c
Commit 9cba9f4c authored 6 years ago by Oleg Zenin
--- a/Projects/AthDataQuality/build.sh
+++ b/Projects/AthDataQuality/build.sh
@@ -3,6 +3,7 @@
 # Script for building the release on top of externals built using one of the
 # scripts in this directory.
 #
+_time_() { local c="time -p " ; while test "X$1" != "X" ; do c+=" \"$1\"" ; shift; done; ( eval "$c" ) 2>&1 | sed "s,^real[[:space:]],time::${c}:: real ," ; }

 # Function printing the usage information for the script
 usage() {
@@ -98,7 +99,7 @@ if [ -n "$EXE_CMAKE" ]; then
    # from scratch in an incremental build.
    rm -f CMakeCache.txt
    # Now run the actual CMake configuration:
-    time cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} \
+    _time_ cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} \
        -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
        ${AthDataQualitySrcDir} 2>&1 | tee cmake_config.log
 fi
@@ -111,18 +112,18 @@ fi

 # make:
 if [ -n "$EXE_MAKE" ]; then
-    time make -k 2>&1 | tee cmake_build.log
+    _time_ make -k 2>&1 | tee cmake_build.log
 fi

 # Install the results:
 if [ -n "$EXE_INSTALL" ]; then
-    time make install/fast \
+    _time_ make install/fast \
        DESTDIR=${BUILDDIR}/install/AthDataQuality/${NICOS_PROJECT_VERSION} \
        2>&1 | tee cmake_install.log
 fi

 # Build an RPM for the release:
 if [ -n "$EXE_CPACK" ]; then
-    time cpack 2>&1 | tee cmake_cpack.log
+    _time_ cpack 2>&1 | tee cmake_cpack.log
    cp AthDataQuality*.rpm ${BUILDDIR}/
 fi
--- a/Projects/AthDerivation/build.sh
+++ b/Projects/AthDerivation/build.sh
@@ -3,6 +3,7 @@
 # Script for building the release on top of externals built using one of the
 # scripts in this directory.
 #
+_time_() { local c="time -p " ; while test "X$1" != "X" ; do c+=" \"$1\"" ; shift; done; ( eval "$c" ) 2>&1 | sed "s,^real[[:space:]],time::${c}:: real ," ; }

 # Function printing the usage information for the script
 usage() {
@@ -102,7 +103,7 @@ if [ -n "$EXE_CMAKE" ]; then
    # from scratch in an incremental build.
    rm -f CMakeCache.txt
    # Now run the actual CMake configuration:
-    time cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} \
+    _time_ cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} \
        -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
        ${AthDerivationSrcDir} 2>&1 | tee cmake_config.log
 fi
@@ -119,17 +120,17 @@ if [ -n "$EXE_MAKE" ]; then
    if [ -n "$NIGHTLY" ]; then
        EXTRAOPT=-k
    fi
-    time make ${EXTRAOPT} 2>&1 | tee cmake_build.log
+    _time_ make ${EXTRAOPT} 2>&1 | tee cmake_build.log
 fi

 # Install the results:
 if [ -n "$EXE_INSTALL" ]; then
-    time make install/fast \
+    _time_ make install/fast \
 	DESTDIR=${BUILDDIR}/install/AthDerivation/${NICOS_PROJECT_VERSION} 2>&1 | tee cmake_install.log
 fi

 # Build an RPM for the release:
 if [ -n "$EXE_CPACK" ]; then
-    time cpack 2>&1 | tee cmake_cpack.log
+    _time_ cpack 2>&1 | tee cmake_cpack.log
    cp AthDerivation*.rpm ${BUILDDIR}/
 fi
--- a/Projects/AthSimulation/build.sh
+++ b/Projects/AthSimulation/build.sh
@@ -3,6 +3,7 @@
 # Script for building the release on top of externals built using one of the
 # scripts in this directory.
 #
+_time_() { local c="time -p " ; while test "X$1" != "X" ; do c+=" \"$1\"" ; shift; done; ( eval "$c" ) 2>&1 | sed "s,^real[[:space:]],time::${c}:: real ," ; }

 # Function printing the usage information for the script
 usage() {
@@ -98,7 +99,7 @@ if [ -n "$EXE_CMAKE" ]; then
    # from scratch in an incremental build.
    rm -f CMakeCache.txt
    # Now run the actual CMake configuration:
-    time cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} \
+    _time_ cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} \
        -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
        ${AthSimulationSrcDir} 2>&1 | tee cmake_config.log
 fi
@@ -111,17 +112,17 @@ fi

 # make:
 if [ -n "$EXE_MAKE" ]; then
-    time make -k 2>&1 | tee cmake_build.log
+    _time_ make -k 2>&1 | tee cmake_build.log
 fi

 # Install the results:
 if [ -n "$EXE_INSTALL" ]; then
-    time make install/fast \
+    _time_ make install/fast \
 	DESTDIR=${BUILDDIR}/install/AthSimulation/${NICOS_PROJECT_VERSION} 2>&1 | tee cmake_install.log
 fi

 # Build an RPM for the release:
 if [ -n "$EXE_CPACK" ]; then
-    time cpack 2>&1 | tee cmake_cpack.log
+    _time_ cpack 2>&1 | tee cmake_cpack.log
    cp AthSimulation*.rpm ${BUILDDIR}/
 fi
--- a/Projects/Athena/build.sh
+++ b/Projects/Athena/build.sh
@@ -3,6 +3,7 @@
 # Script for building the release on top of externals built using one of the
 # scripts in this directory.
 #
+_time_() { local c="time -p " ; while test "X$1" != "X" ; do c+=" \"$1\"" ; shift; done; ( eval "$c" ) 2>&1 | sed "s,^real[[:space:]],time::${c}:: real ," ; }

 # Function printing the usage information for the script
 usage() {
@@ -102,7 +103,7 @@ if [ -n "$EXE_CMAKE" ]; then
    # from scratch in an incremental build.
    rm -f CMakeCache.txt
    # Now run the actual CMake configuration:
-    time cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} \
+    _time_ cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} \
        -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
        ${AthenaSrcDir} 2>&1 | tee cmake_config.log
 fi
@@ -115,18 +116,18 @@ fi

 # make:
 if [ -n "$EXE_MAKE" ]; then
-    time make -k 2>&1 | tee cmake_build.log
+    _time_ make -k 2>&1 | tee cmake_build.log
 fi

 # Install the results:
 if [ -n "$EXE_INSTALL" ]; then
-    time make install/fast \
+    _time_ make install/fast \
 	DESTDIR=${BUILDDIR}/install/Athena/${NICOS_PROJECT_VERSION} 2>&1 | tee cmake_install.log
 fi

 # Build an RPM for the release:
 if [ -n "$EXE_CPACK" ]; then
-    time cpack 2>&1 | tee cmake_cpack.log
+    _time_ cpack 2>&1 | tee cmake_cpack.log
    cp Athena*.rpm ${BUILDDIR}/
 fi

--- a/Projects/AthenaP1/build.sh
+++ b/Projects/AthenaP1/build.sh
@@ -3,6 +3,7 @@
 # Script for building the release on top of externals built using one of the
 # scripts in this directory.
 #
+_time_() { local c="time -p " ; while test "X$1" != "X" ; do c+=" \"$1\"" ; shift; done; ( eval "$c" ) 2>&1 | sed "s,^real[[:space:]],time::${c}:: real ," ; }

 # Function printing the usage information for the script
 usage() {
@@ -102,7 +103,7 @@ if [ -n "$EXE_CMAKE" ]; then
    # from scratch in an incremental build.
    rm -f CMakeCache.txt
    # Now run the actual CMake configuration:
-    time cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} \
+    _time_ cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} \
        -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
        ${AthenaP1SrcDir} 2>&1 | tee cmake_config.log
 fi
@@ -115,17 +116,17 @@ fi

 # make:
 if [ -n "$EXE_MAKE" ]; then
-    time make -k 2>&1 | tee cmake_build.log
+    _time_ make -k 2>&1 | tee cmake_build.log
 fi

 # Install the results:
 if [ -n "$EXE_INSTALL" ]; then
-    time make install/fast \
+    _time_ make install/fast \
 	DESTDIR=${BUILDDIR}/install/AthenaP1/${NICOS_PROJECT_VERSION} 2>&1 | tee cmake_install.log
 fi

 # Build an RPM for the release:
 if [ -n "$EXE_CPACK" ]; then
-    time cpack 2>&1 | tee cmake_cpack.log
+    _time_ cpack 2>&1 | tee cmake_cpack.log
    cp AthenaP1*.rpm ${BUILDDIR}/
 fi