From 356f496f16219c5e3bd9a651b867c48411bde17d Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Tue, 28 May 2019 17:25:58 +0200
Subject: Fix printers.sh test when missing coqtop.byte, print more info

---
 test-suite/Makefile         | 1 -
 test-suite/misc/printers.sh | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'test-suite')

diff --git a/test-suite/Makefile b/test-suite/Makefile
index 94011447d7..552d007f85 100644
--- a/test-suite/Makefile
+++ b/test-suite/Makefile
@@ -561,7 +561,6 @@ $(patsubst %.sh,%.log,$(wildcard misc/*.sh)): %.log: %.sh $(PREREQUISITELOG)
 	  export coqc="$(coqc)"; \
 	  export coqtop="$(coqc)"; \
 	  export coqdep="$(coqdep)"; \
-	  export coqtopbyte="$(coqtopbyte)"; \
 	  "$<" 2>&1; R=$$?; times; \
 	  if [ $$R = 0 ]; then \
 	    echo $(log_success); \
diff --git a/test-suite/misc/printers.sh b/test-suite/misc/printers.sh
index ef3f056d89..f659fce680 100755
--- a/test-suite/misc/printers.sh
+++ b/test-suite/misc/printers.sh
@@ -1,2 +1,8 @@
 #!/bin/sh
-if printf "Drop. #use\"include\";; #quit;;\n" | $coqtopbyte 2>&1 | grep -E "Error|Unbound" ; then exit 1; else exit 0; fi
+
+command -v "${BIN}coqtop.byte" || { echo "Missing coqtop.byte"; exit 1; }
+
+f=$(mktemp)
+printf 'Drop. #use"include";; #quit;;\n' | "${BIN}coqtop.byte" -q 2>&1 | tee "$f"
+
+if grep -q -E "Error|Unbound" "$f"; then exit 1; fi
-- 
cgit v1.2.3