From 90586a86bcc27032a3b4991e47cc3b73d1e147cc Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 4 Mar 2019 10:39:31 +0100
Subject: [PATCH] make check: Do not re-check unless recheck=true.

* build-aux/check-mescc.sh (recheck): New variable.
* build-aux/check.sh.in (recheck): New variable.
* build-aux/test-suite.sh (TEST_LOGS): Use it.
---
 build-aux/check-mescc.sh | 1 +
 build-aux/check.sh.in    | 3 +++
 build-aux/test-suite.sh  | 8 +++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/build-aux/check-mescc.sh b/build-aux/check-mescc.sh
index b473c9ce..f13d4047 100755
--- a/build-aux/check-mescc.sh
+++ b/build-aux/check-mescc.sh
@@ -266,6 +266,7 @@ lib/tests/string/90-snprintf.c
     fi
 fi
 
+recheck=${recheck-false}
 test_ext=.c
 log_compiler=${srcdest}build-aux/test-c.sh
 . ${srcdest}build-aux/test-suite.sh
diff --git a/build-aux/check.sh.in b/build-aux/check.sh.in
index e7c6c490..6732910e 100644
--- a/build-aux/check.sh.in
+++ b/build-aux/check.sh.in
@@ -57,6 +57,9 @@ export CPPFLAGS
 export LDFLAGS
 #export LIBS
 
+recheck=${recheck-false}
+export recheck
+
 ./pre-inst-env sh ${srcdest}build-aux/check-boot.sh
 ./pre-inst-env sh ${srcdest}build-aux/check-mes.sh
 
diff --git a/build-aux/test-suite.sh b/build-aux/test-suite.sh
index 32909df8..976b3cac 100644
--- a/build-aux/test-suite.sh
+++ b/build-aux/test-suite.sh
@@ -29,6 +29,13 @@ subdir=$(basename $(pwd))
 TEST_LOGS=
 for t in $TESTS; do
     b=$(dirname $t)/$(basename $t $test_ext)
+    TEST_LOGS="$TEST_LOGS $b.log"
+    if test -e $b.log \
+            && test -e $b.trs\
+            && ! $recheck; then
+        echo `grep :test-result $b.trs | cut -d' ' -f 2`: $b
+        continue
+    fi
     d=$(dirname $t)
     case " `echo $XFAIL_TESTS` " in
         *[\ \	]$t[\ \	]*)
@@ -46,7 +53,6 @@ for t in $TESTS; do
        --expect-failure $fail\
        -- $log_compiler\
        ${srcdest}$t
-    TEST_LOGS="$TEST_LOGS $b.log"
 done
 
 if test $colors = yes; then