From c9e177577ebabbc6cf61bada77a0d36d19570544 Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Fri, 16 Nov 2018 16:54:02 +0100
Subject: Print logs in appveyor test suite run

It seems we forgot to export when moving the script to a separate file.
---
 test-suite/Makefile  | 8 --------
 test-suite/report.sh | 5 +++--
 2 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'test-suite')

diff --git a/test-suite/Makefile b/test-suite/Makefile
index 928a77cb8e..1db97f43c5 100644
--- a/test-suite/Makefile
+++ b/test-suite/Makefile
@@ -187,14 +187,6 @@ summary.log:
 	$(SHOW) BUILDING SUMMARY FILE
 	$(HIDE)$(MAKE) --quiet summary > "$@"
 
-# if not on travis we can get the log files (they're just there for a
-# local build, and downloadable on GitLab)
-PRINT_LOGS?=
-TRAVIS?= # special because we want to print travis_fold directives
-ifdef APPVEYOR
-PRINT_LOGS:=APPVEYOR
-endif #APPVEYOR
-
 report: summary.log
 	$(HIDE)bash report.sh
 
diff --git a/test-suite/report.sh b/test-suite/report.sh
index 05f39b4b02..c5e698232f 100755
--- a/test-suite/report.sh
+++ b/test-suite/report.sh
@@ -24,7 +24,7 @@ cp summary.log "$SAVEDIR"/
 rm "$FAILED"
 
 # print info
-if [ -n "$TRAVIS" ] || [ -n "$PRINT_LOGS" ]; then
+if [ -n "$TRAVIS" ] || [ -n "$APPVEYOR" ] || [ -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
@@ -40,12 +40,13 @@ if [ -n "$TRAVIS" ] || [ -n "$PRINT_LOGS" ]; then
         else printf '\n'
         fi
     done
+    printed_logs=1
 fi
 
 if grep -q -F 'Error!' summary.log ; then
     echo FAILURES;
     grep -F 'Error!' summary.log;
-    if [ -z "$TRAVIS" ] && [ -z "$PRINT_LOGS" ]; then
+    if [ -z "$printed_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.'
-- 
cgit v1.2.3