From: Florian Krohm <florian@eich-krohm.de>
Date: Mon, 3 Aug 2015 20:03:41 +0000 (+0000)
Subject: Improve the script to also show failures in the post-regtest checks
X-Git-Tag: svn/VALGRIND_3_11_0~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc91b2eb21ccd04bc59a99ecf89ff77b88420aa7;p=thirdparty%2Fvalgrind.git

Improve the script to also show failures in the post-regtest checks
in the regtest log.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15478
---

diff --git a/nightly/bin/nightly b/nightly/bin/nightly
index 583e7a9c7b..121e6a8b1f 100755
--- a/nightly/bin/nightly
+++ b/nightly/bin/nightly
@@ -175,6 +175,9 @@ for logfile in old new ; do
           "Running regression tests         " \
           "cd valgrind-$logfile && ${ABT_RUN_REGTEST}"
 
+   # Stash away the return code of the regression run
+   regrun_rc=$?
+
    # Grab some indicative text for the short log file -- if the regtests
    # succeeded, show their results.  If we didn't make it that far, show the
    # last 20 lines.
@@ -183,6 +186,14 @@ for logfile in old new ; do
       echo "Regression test results follow" >> $logfile.short
       echo >> $logfile.short
       awk '/^== [0-9]+ tests/, /^$/ { print }' $logfile.verbose >> $logfile.short
+   # Check the return code of the regression run; we might have successfully
+   # run all tests but still failed in the post-regtest checks.
+      if [ $regrun_rc != "0" ]; then
+         echo >> $logfile.short
+         echo "Last 20 lines of verbose log follow" >> $logfile.short \
+         echo >> $logfile.short
+         tail -20 $logfile.verbose >> $logfile.short
+      fi
    ) || (
       echo >> $logfile.short
       echo "Last 20 lines of verbose log follow" >> $logfile.short \