3 files changed, 56 insertions, 23 deletions
diff --git a/test-suite/Makefile b/test-suite/Makefile
index 080aeff85b..93ce519350 100644
--- a/test-suite/Makefile
+++ b/test-suite/Makefile
@@ -196,10 +196,7 @@ PRINT_LOGS:=APPVEYOR
 endif #APPVEYOR
 
 report: summary.log
-	$(HIDE)bash save-logs.sh
-	$(HIDE)if [ -n "${TRAVIS}" ]; then find logs/ -name '*.log' -not -name 'summary.log' -exec 'bash' '-c' 'echo "travis_fold:start:coq.logs.$$(echo '{}' | sed s,/,.,g)"' ';' -exec cat '{}' ';' -exec 'bash' '-c' 'echo "travis_fold:end:coq.logs.$$(echo '{}' | sed s,/,.,g)"' ';'; fi
-	$(HIDE)if [ -n "${PRINT_LOGS}" ]; then find logs/ -name '*.log' -not -name 'summary.log' -exec 'bash' '-c' 'echo {}' ';' -exec cat '{}' ';' -exec 'bash' '-c' 'echo' ';'; fi
-	$(HIDE)if grep -q -F 'Error!' summary.log ; then echo FAILURES; grep -F 'Error!' summary.log; false; else echo NO FAILURES; fi
+	$(HIDE)bash report.sh
 
 #######################################################################
 # Regression (and progression) tests
diff --git a/test-suite/report.sh b/test-suite/report.sh
new file mode 100755
index 0000000000..05f39b4b02
--- /dev/null
+++ b/test-suite/report.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# save failed logs to logs/, then print failure information
+# returns failure code if any failed logs exist
+
+# save step
+
+SAVEDIR="logs"
+
+# reset for local builds
+rm -rf "$SAVEDIR"
+mkdir "$SAVEDIR"
+
+# keep this synced with test-suite/Makefile
+FAILMARK="==========> FAILURE <=========="
+
+FAILED=$(mktemp /tmp/coq-check-XXXXXX)
+find . '(' -path ./bugs/opened -prune ')' -o '(' -name '*.log' -exec grep "$FAILMARK" -q '{}' ';' -print0 ')' > "$FAILED"
+
+rsync -a --from0 --files-from="$FAILED" . "$SAVEDIR"
+cp summary.log "$SAVEDIR"/
+
+# cleanup
+rm "$FAILED"
+
+# print info
+if [ -n "$TRAVIS" ] || [ -n "$PRINT_LOGS" ]; then
+    find logs/ -name '*.log' -not -name 'summary.log' -print0 | while IFS= read -r -d '' file; do
+        if [ -n "$TRAVIS" ]; then
+            # ${foo////.} replaces every / by . in $foo
+            printf 'travis_fold:start:coq.logs.%s\n' "${file////.}";
+        else printf '%s\n' "$file"
+        fi
+
+        cat "$file"
+
+        if [ -n "$TRAVIS" ]; then
+            # ${foo////.} replaces every / by . in $foo
+            printf 'travis_fold:end:coq.logs.%s\n' "${file////.}";
+        else printf '\n'
+        fi
+    done
+fi
+
+if grep -q -F 'Error!' summary.log ; then
+    echo FAILURES;
+    grep -F 'Error!' summary.log;
+    if [ -z "$TRAVIS" ] && [ -z "$PRINT_LOGS" ]; then
+        echo 'To print details of failed tests, rerun with environment variable PRINT_LOGS=1'
+        echo 'eg "make report PRINT_LOGS=1" from the test suite directory"'
+        echo 'See README.md in the test suite directory for more information.'
+    fi
+    false
+else echo NO FAILURES;
+fi
diff --git a/test-suite/save-logs.sh b/test-suite/save-logs.sh
deleted file mode 100755
index 9b8fff09f8..0000000000
--- a/test-suite/save-logs.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-SAVEDIR="logs"
-
-# reset for local builds
-rm -rf "$SAVEDIR"
-mkdir "$SAVEDIR"
-
-# keep this synced with test-suite/Makefile
-FAILMARK="==========> FAILURE <=========="
-
-FAILED=$(mktemp /tmp/coq-check-XXXXXX)
-find . '(' -path ./bugs/opened -prune ')' -o '(' -name '*.log' -exec grep "$FAILMARK" -q '{}' ';' -print0 ')' > "$FAILED"
-
-rsync -a --from0 --files-from="$FAILED" . "$SAVEDIR"
-cp summary.log "$SAVEDIR"/
-
-# cleanup
-rm "$FAILED"