From: Michal Nowak <mnowak@isc.org>
Date: Mon, 3 Aug 2020 06:36:05 +0000 (+0200)
Subject: Make sure .txt files are not identified as crashed test
X-Git-Tag: v9.17.5~55^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2dcd9596697e768626d9cbc417467e399ceae3e;p=thirdparty%2Fbind9.git

Make sure .txt files are not identified as crashed test

Previously .txt files with full backtrace may be identified as a
crashed test:

    I:Core dumps were found for the following system tests:
    I:	 core.19948-backtrace.txt
    I:   shutdown

Now .txt files are removed from the list.

Change 'run.sh.in' to match the core matching pattern in
'testsummary.sh'.
---

diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in
index c59a3e2cfdc..0d291a4b010 100644
--- a/bin/tests/system/run.sh.in
+++ b/bin/tests/system/run.sh.in
@@ -252,7 +252,7 @@ else
 fi
 
 get_core_dumps() {
-    find "$systest/" \( -name 'core*' -or -name '*.core' \) ! -name '*.gz' ! -name '*.txt' | sort
+    find "$systest/" \( -name 'core' -or -name 'core.*' -or -name '*.core' \) ! -name '*.gz' ! -name '*.txt' | sort
 }
 
 core_dumps=$(get_core_dumps | tr '\n' ' ')
diff --git a/bin/tests/system/testsummary.sh b/bin/tests/system/testsummary.sh
index dbd8684c694..33e6fc2c74a 100644
--- a/bin/tests/system/testsummary.sh
+++ b/bin/tests/system/testsummary.sh
@@ -61,7 +61,7 @@ if [ -n "${FAILED_TESTS}" ]; then
 	status=1
 fi
 
-CRASHED_TESTS=$(find . -name 'core*' -or -name '*.core' | cut -d'/' -f2 | sort -u | sed -e 's/^/I:      /')
+CRASHED_TESTS=$(find . \( -name 'core' -or -name 'core.*' -or -name '*.core' \) ! -name '*.txt' | cut -d'/' -f2 | sort -u | sed -e 's/^/I:      /')
 if [ -n "${CRASHED_TESTS}" ]; then
 	echoinfo "I:Core dumps were found for the following system tests:"
 	echoinfo "${CRASHED_TESTS}"