From 7077edda0f2ea2e721e7be9fbae35536ae7f53a0 Mon Sep 17 00:00:00 2001
From: Graeme A Stewart <graeme.andrew.stewart@cern.ch>
Date: Sat, 1 Apr 2017 17:53:16 +0200
Subject: [PATCH] Improve error reporting from build_*.sh scripts
Suppress the bogus errors from the "ls" command in AtlasExternals
GIve an explicit error message if error count is non-zero at end of scripts
Former-commit-id: 3532767fc67bcb88347563fadf5ccf82f0ad4def
---
Build/AtlasBuildScripts/build_Gaudi.sh | 4 ++++
Build/AtlasBuildScripts/build_atlasexternals.sh | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Build/AtlasBuildScripts/build_Gaudi.sh b/Build/AtlasBuildScripts/build_Gaudi.sh
index 5138e9acea2..71c8fc25bbb 100755
--- a/Build/AtlasBuildScripts/build_Gaudi.sh
+++ b/Build/AtlasBuildScripts/build_Gaudi.sh
@@ -107,4 +107,8 @@ cpack || ((ERROR_COUNT++))
mkdir -p ${RPMDIR} || ((ERROR_COUNT++))
cp GAUDI*.rpm ${RPMDIR} || ((ERROR_COUNT++))
+if [ $ERROR_COUNT -ne 0 ]; then
+ echo "Gaudi build script counted $ERROR_COUNT errors"
+fi
+
exit ${ERROR_COUNT}
diff --git a/Build/AtlasBuildScripts/build_atlasexternals.sh b/Build/AtlasBuildScripts/build_atlasexternals.sh
index 3848ef0025f..255698264cc 100755
--- a/Build/AtlasBuildScripts/build_atlasexternals.sh
+++ b/Build/AtlasBuildScripts/build_atlasexternals.sh
@@ -98,7 +98,11 @@ fi
# Build the RPM or other package for the project:
cpack || ((ERROR_COUNT++))
mkdir -p ${RPMDIR} || ((ERROR_COUNT++))
-FILES=$(ls ${PROJECT}*.rpm ${PROJECT}*.tar.gz ${PROJECT}*.dmg)
+FILES=$(ls ${PROJECT}*.rpm ${PROJECT}*.tar.gz ${PROJECT}*.dmg 2> /dev/null)
cp ${FILES} ${RPMDIR} || ((ERROR_COUNT++))
+if [ $ERROR_COUNT -ne 0 ]; then
+ echo "AtlasExternals build script counted $ERROR_COUNT errors"
+fi
+
exit ${ERROR_COUNT}
--
GitLab