From: Michał Kępień <michal@isc.org>
Date: Thu, 22 Feb 2018 13:07:17 +0000 (+0100)
Subject: Tweak the regular expression used for extracting system test results
X-Git-Tag: v9.13.0~128^2~3
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=9006d6dbbdad0bd2969c401e1e6bb468ffc85324;p=thirdparty%2Fbind9.git

Tweak the regular expression used for extracting system test results

The current regular expression used for extracting system test results
from systests.output, "^R:", is anchored at the start of a line, which
prevents colored system test output from being properly processed.  As
just "R:" would arguably be too general, extend the pattern a bit to
ensure it will only match lines containing system test results.
---

diff --git a/bin/tests/system/testsummary.sh b/bin/tests/system/testsummary.sh
index 1f4a0dacd08..d1162f6923b 100644
--- a/bin/tests/system/testsummary.sh
+++ b/bin/tests/system/testsummary.sh
@@ -42,7 +42,7 @@ fi
 
 status=0
 echo "I:System test result summary:"
-grep '^R:' systests.output | cut -d':' -f3 | sort | uniq -c | sed -e 's/^/I:/'
-grep '^R:[^:]*:FAIL' systests.output > /dev/null && status=1
+grep 'R:[a-z0-9_-][a-z0-9_-]*:[A-Z][A-Z]*' systests.output | cut -d':' -f3 | sort | uniq -c | sed -e 's/^/I:/'
+grep 'R:[a-z0-9_-][a-z0-9_-]*:FAIL' systests.output > /dev/null && status=1
 
 exit $status