Merge branch 'ATLINFR-2731-21.0-mc16a' into '21.0-mc16a'

time prints the full cmd line before real..user..sys (for branch 21.0-mc16a)

See merge request atlas/athena!15735

Former-commit-id: eafcfa4719c8740155f7256ae4e8ec390cdccc4f

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_="/usr/bin/time -f time::\t%C::\treal:\t%E\tuser:\t%U\tsys:\t%S\n "
 
 # 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

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_="/usr/bin/time -f time::\t%C::\treal:\t%E\tuser:\t%U\tsys:\t%S\n "
 
 # 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
 

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_="/usr/bin/time -f time::\t%C::\treal:\t%E\tuser:\t%U\tsys:\t%S\n "
 
 # 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