From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Tue, 18 Apr 2023 19:18:12 +0000 (+0200)
Subject: regtest: try to make the nightly script independent of test times
X-Git-Tag: VALGRIND_3_21_0~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04054f36be59eeb337f23932424a7e70bbfeba70;p=thirdparty%2Fvalgrind.git

regtest: try to make the nightly script independent of test times
---

diff --git a/nightly/bin/nightly b/nightly/bin/nightly
index d4783f95d4..e41510e51e 100755
--- a/nightly/bin/nightly
+++ b/nightly/bin/nightly
@@ -146,6 +146,9 @@ for logfile in old new ; do
    # 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.
+   # Change 68cf3b5dbfecb96c618c371359000daaaf4293b5 added time information to the
+   # logs, which is fairly variable. The sed filter deletes this so that we don't
+   # generate spurious diffs.
    egrep -q '^== [0-9]+ tests' $logfile.verbose && (
       echo >> $logfile.short
       echo "Regression test results follow" >> $logfile.short
@@ -157,7 +160,7 @@ for logfile in old new ; do
          echo >> $logfile.short
          echo "Last 20 lines of verbose log follow" >> $logfile.short \
          echo >> $logfile.short
-         tail -20 $logfile.verbose >> $logfile.short
+         tail -20 $logfile.verbose | sed 's/(in [0-9]* sec) -*//' >> $logfile.short
       fi
    ) || (
       echo >> $logfile.short