From 797eb524853e361f84c9c776024c142107f0c282 Mon Sep 17 00:00:00 2001
From: charguer
Date: Thu, 12 Dec 2019 10:48:50 +0100
Subject: Fix #11195 and add other improvements: try loading .vio (and not just
 .vo) if the .vos file is empty, rename -quick to -vio, dump empty .vos when
 producing .vio, dump empty .vos and .vok files when producing .vo from .vio.

---
 test-suite/Makefile              | 2 +-
 test-suite/misc/quick-include.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'test-suite')

diff --git a/test-suite/Makefile b/test-suite/Makefile
index 609a61226b..bfdf34b1cf 100644
--- a/test-suite/Makefile
+++ b/test-suite/Makefile
@@ -635,7 +635,7 @@ vio: $(patsubst %.v,%.vio.log,$(wildcard vio/*.v))
 %.vio.log:%.v
 	@echo "TEST      $<"
 	$(HIDE){ \
-	  $(coqc) -quick -R vio vio $* 2>&1 && \
+	  $(coqc) -vio -R vio vio $* 2>&1 && \
 	  $(coqc) -R vio vio -vio2vo $*.vio 2>&1 && \
 	  $(coqchk) -R vio vio -norec $(subst /,.,$*) 2>&1; \
 	  if [ $$? = 0 ]; then \
diff --git a/test-suite/misc/quick-include.sh b/test-suite/misc/quick-include.sh
index 96bdee2fc2..e60fb48bca 100755
--- a/test-suite/misc/quick-include.sh
+++ b/test-suite/misc/quick-include.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 set -e
 
-$coqc -R misc/quick-include/ QuickInclude -quick misc/quick-include/file1.v
-$coqc -R misc/quick-include/ QuickInclude -quick misc/quick-include/file2.v
+$coqc -R misc/quick-include/ QuickInclude -vio misc/quick-include/file1.v
+$coqc -R misc/quick-include/ QuickInclude -vio misc/quick-include/file2.v
-- 
cgit v1.2.3


From e4c7359baadf988abcacc15794dff5e72b54b78d Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Wed, 8 Jan 2020 15:00:30 +0100
Subject: replace deprecated -quick with -vio in the test suite

---
 test-suite/output/ErrorInModule.v  | 2 +-
 test-suite/output/ErrorInSection.v | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'test-suite')

diff --git a/test-suite/output/ErrorInModule.v b/test-suite/output/ErrorInModule.v
index b2e3c3e923..fbb3c6bdab 100644
--- a/test-suite/output/ErrorInModule.v
+++ b/test-suite/output/ErrorInModule.v
@@ -1,4 +1,4 @@
-(* -*- mode: coq; coq-prog-args: ("-quick") -*- *)
+(* -*- mode: coq; coq-prog-args: ("-vio") -*- *)
 Module M.
   Definition foo := nonexistent.
 End M.
diff --git a/test-suite/output/ErrorInSection.v b/test-suite/output/ErrorInSection.v
index 505c5ce378..a961330b81 100644
--- a/test-suite/output/ErrorInSection.v
+++ b/test-suite/output/ErrorInSection.v
@@ -1,4 +1,4 @@
-(* -*- mode: coq; coq-prog-args: ("-quick") -*- *)
+(* -*- mode: coq; coq-prog-args: ("-vio") -*- *)
 Section S.
   Definition foo := nonexistent.
 End S.
-- 
cgit v1.2.3