Skip to content
Snippets Groups Projects
Commit c9893d8b authored by Pedro Teixeira-Dias's avatar Pedro Teixeira-Dias
Browse files

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

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

See merge request atlas/athena!15734

Former-commit-id: e6bfe993419067e5a1b04318e32aeae09f24398f
parents 7eb7e09c 47d07727
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Projects/AthDataQuality/build.sh
+ 5
− 4
View file @ c9893d8b
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# Script for building the release on top of externals built using one of the # Script for building the release on top of externals built using one of the
# scripts in this directory. # 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 # Function printing the usage information for the script
usage() { usage() {
...@@ -98,7 +99,7 @@ if [ -n "$EXE_CMAKE" ]; then ...@@ -98,7 +99,7 @@ if [ -n "$EXE_CMAKE" ]; then
# from scratch in an incremental build. # from scratch in an incremental build.
rm -f CMakeCache.txt rm -f CMakeCache.txt
# Now run the actual CMake configuration: # 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 \ -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
${AthDataQualitySrcDir} 2>&1 | tee cmake_config.log ${AthDataQualitySrcDir} 2>&1 | tee cmake_config.log
fi fi
...@@ -111,18 +112,18 @@ fi ...@@ -111,18 +112,18 @@ fi
# make: # make:
if [ -n "$EXE_MAKE" ]; then if [ -n "$EXE_MAKE" ]; then
time make -k 2>&1 | tee cmake_build.log $_time_ make -k 2>&1 | tee cmake_build.log
fi fi
# Install the results: # Install the results:
if [ -n "$EXE_INSTALL" ]; then if [ -n "$EXE_INSTALL" ]; then
time make install/fast \ $_time_ make install/fast \
DESTDIR=${BUILDDIR}/install/AthDataQuality/${NICOS_PROJECT_VERSION} \ DESTDIR=${BUILDDIR}/install/AthDataQuality/${NICOS_PROJECT_VERSION} \
2>&1 | tee cmake_install.log 2>&1 | tee cmake_install.log
fi fi
# Build an RPM for the release: # Build an RPM for the release:
if [ -n "$EXE_CPACK" ]; then 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}/ cp AthDataQuality*.rpm ${BUILDDIR}/
fi fi
Projects/AthDerivation/build.sh
+ 5
− 4
View file @ c9893d8b
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# Script for building the release on top of externals built using one of the # Script for building the release on top of externals built using one of the
# scripts in this directory. # 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 # Function printing the usage information for the script
usage() { usage() {
...@@ -102,7 +103,7 @@ if [ -n "$EXE_CMAKE" ]; then ...@@ -102,7 +103,7 @@ if [ -n "$EXE_CMAKE" ]; then
# from scratch in an incremental build. # from scratch in an incremental build.
rm -f CMakeCache.txt rm -f CMakeCache.txt
# Now run the actual CMake configuration: # 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 \ -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
${AthDerivationSrcDir} 2>&1 | tee cmake_config.log ${AthDerivationSrcDir} 2>&1 | tee cmake_config.log
fi fi
...@@ -119,17 +120,17 @@ if [ -n "$EXE_MAKE" ]; then ...@@ -119,17 +120,17 @@ if [ -n "$EXE_MAKE" ]; then
if [ -n "$NIGHTLY" ]; then if [ -n "$NIGHTLY" ]; then
EXTRAOPT=-k EXTRAOPT=-k
fi fi
time make ${EXTRAOPT} 2>&1 | tee cmake_build.log $_time_ make ${EXTRAOPT} 2>&1 | tee cmake_build.log
fi fi
# Install the results: # Install the results:
if [ -n "$EXE_INSTALL" ]; then 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 DESTDIR=${BUILDDIR}/install/AthDerivation/${NICOS_PROJECT_VERSION} 2>&1 | tee cmake_install.log
fi fi
# Build an RPM for the release: # Build an RPM for the release:
if [ -n "$EXE_CPACK" ]; then 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}/ cp AthDerivation*.rpm ${BUILDDIR}/
fi fi
Projects/AthSimulation/build.sh
+ 5
− 4
View file @ c9893d8b
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# Script for building the release on top of externals built using one of the # Script for building the release on top of externals built using one of the
# scripts in this directory. # 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 # Function printing the usage information for the script
usage() { usage() {
...@@ -98,7 +99,7 @@ if [ -n "$EXE_CMAKE" ]; then ...@@ -98,7 +99,7 @@ if [ -n "$EXE_CMAKE" ]; then
# from scratch in an incremental build. # from scratch in an incremental build.
rm -f CMakeCache.txt rm -f CMakeCache.txt
# Now run the actual CMake configuration: # 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 \ -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
${AthSimulationSrcDir} 2>&1 | tee cmake_config.log ${AthSimulationSrcDir} 2>&1 | tee cmake_config.log
fi fi
...@@ -111,17 +112,17 @@ fi ...@@ -111,17 +112,17 @@ fi
# make: # make:
if [ -n "$EXE_MAKE" ]; then if [ -n "$EXE_MAKE" ]; then
time make -k 2>&1 | tee cmake_build.log $_time_ make -k 2>&1 | tee cmake_build.log
fi fi
# Install the results: # Install the results:
if [ -n "$EXE_INSTALL" ]; then 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 DESTDIR=${BUILDDIR}/install/AthSimulation/${NICOS_PROJECT_VERSION} 2>&1 | tee cmake_install.log
fi fi
# Build an RPM for the release: # Build an RPM for the release:
if [ -n "$EXE_CPACK" ]; then 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}/ cp AthSimulation*.rpm ${BUILDDIR}/
fi fi
Projects/Athena/build.sh
+ 5
− 4
View file @ c9893d8b
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# Script for building the release on top of externals built using one of the # Script for building the release on top of externals built using one of the
# scripts in this directory. # 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 # Function printing the usage information for the script
usage() { usage() {
...@@ -102,7 +103,7 @@ if [ -n "$EXE_CMAKE" ]; then ...@@ -102,7 +103,7 @@ if [ -n "$EXE_CMAKE" ]; then
# from scratch in an incremental build. # from scratch in an incremental build.
rm -f CMakeCache.txt rm -f CMakeCache.txt
# Now run the actual CMake configuration: # 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 \ -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
${AthenaSrcDir} 2>&1 | tee cmake_config.log ${AthenaSrcDir} 2>&1 | tee cmake_config.log
fi fi
...@@ -115,18 +116,18 @@ fi ...@@ -115,18 +116,18 @@ fi
# make: # make:
if [ -n "$EXE_MAKE" ]; then if [ -n "$EXE_MAKE" ]; then
time make -k 2>&1 | tee cmake_build.log $_time_ make -k 2>&1 | tee cmake_build.log
fi fi
# Install the results: # Install the results:
if [ -n "$EXE_INSTALL" ]; then 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 DESTDIR=${BUILDDIR}/install/Athena/${NICOS_PROJECT_VERSION} 2>&1 | tee cmake_install.log
fi fi
# Build an RPM for the release: # Build an RPM for the release:
if [ -n "$EXE_CPACK" ]; then 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}/ cp Athena*.rpm ${BUILDDIR}/
fi fi
Projects/AthenaP1/build.sh
+ 5
− 4
View file @ c9893d8b
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# Script for building the release on top of externals built using one of the # Script for building the release on top of externals built using one of the
# scripts in this directory. # 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 # Function printing the usage information for the script
usage() { usage() {
...@@ -102,7 +103,7 @@ if [ -n "$EXE_CMAKE" ]; then ...@@ -102,7 +103,7 @@ if [ -n "$EXE_CMAKE" ]; then
# from scratch in an incremental build. # from scratch in an incremental build.
rm -f CMakeCache.txt rm -f CMakeCache.txt
# Now run the actual CMake configuration: # 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 \ -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
${AthenaP1SrcDir} 2>&1 | tee cmake_config.log ${AthenaP1SrcDir} 2>&1 | tee cmake_config.log
fi fi
...@@ -115,17 +116,17 @@ fi ...@@ -115,17 +116,17 @@ fi
# make: # make:
if [ -n "$EXE_MAKE" ]; then if [ -n "$EXE_MAKE" ]; then
time make -k 2>&1 | tee cmake_build.log $_time_ make -k 2>&1 | tee cmake_build.log
fi fi
# Install the results: # Install the results:
if [ -n "$EXE_INSTALL" ]; then 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 DESTDIR=${BUILDDIR}/install/AthenaP1/${NICOS_PROJECT_VERSION} 2>&1 | tee cmake_install.log
fi fi
# Build an RPM for the release: # Build an RPM for the release:
if [ -n "$EXE_CPACK" ]; then 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}/ cp AthenaP1*.rpm ${BUILDDIR}/
fi fi
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment