From c960ebea945077a3fb2d569bb0e10564589001c9 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Mon, 19 Sep 2011 22:44:58 -0400 Subject: [PATCH] ENH: nd_build returns with non-0 if any build fails --- tools/nd_build | 7 +++++-- tools/nd_build4allnd | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/nd_build b/tools/nd_build index 562b8aa..baf77a8 100755 --- a/tools/nd_build +++ b/tools/nd_build @@ -77,6 +77,8 @@ else shift; shift; shift; shift fi +# failed will be set to 1 if any build fails +failed= for a in $arch; do # default options="$opts" @@ -98,8 +100,7 @@ for a in $arch; do --buildresult . \ --logfile "${buildfile}" \ $options \ - "$@" && status='OK' || status='FAILED' - + "$@" && status='OK' || { status='FAILED'; failed=1; } timeinfo=$(tail -n 1 "${tsfile}") # Update the summary of builds touch summary.build # Assure existence @@ -107,3 +108,5 @@ for a in $arch; do echo -e "${buildfile}\t$status\t$timeinfo" >> summary.build # Add current one rm -f "${tsfile}" done +# Exit with failure status if any built failed +[ -z $failed ] || exit 1 diff --git a/tools/nd_build4allnd b/tools/nd_build4allnd index 77e7ce9..466271d 100755 --- a/tools/nd_build4allnd +++ b/tools/nd_build4allnd @@ -22,5 +22,5 @@ for d in $allnddists; do drelease=${d##*-} bpdsc=$(nd_backport $drelease $dscfile | tail -n1 | sed -e 's/^.* //g') - nd_build $dfamily $drelease $bpdsc "$@" + nd_build $dfamily $drelease $bpdsc "$@" || : done -- 2.39.5