From d79c96da012da230857dd9a4fa4a417c9dcd246a Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Mon, 3 Aug 2020 08:36:05 +0200
Subject: [PATCH] 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'.

(cherry picked from commit c2dcd9596697e768626d9cbc417467e399ceae3e)
(cherry picked from commit 01119ac4f97b492ed2a87fdedabd739a33513d5c)
---
 bin/tests/system/run.sh         | 2 +-
 bin/tests/system/testsummary.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 7ec4b2d023..aa0648ff36 100755
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -196,7 +196,7 @@ $PERL stop.pl $systest
 status=`expr $status + $?`
 
 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 6089b16770..3304e81f22 100644
--- a/bin/tests/system/testsummary.sh
+++ b/bin/tests/system/testsummary.sh
@@ -56,7 +56,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}"