From abe42494a031a85bd27a029393a9c9a420c56ec1 Mon Sep 17 00:00:00 2001
From: Ralf Jung <jung@mpi-sws.org>
Date: Mon, 23 Jul 2018 12:05:48 +0200
Subject: [PATCH] bump std++; update test suite makefile
---
Makefile.coq.local | 8 ++++----
opam | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile.coq.local b/Makefile.coq.local
index 7e0566de3..ebe43273f 100644
--- a/Makefile.coq.local
+++ b/Makefile.coq.local
@@ -8,7 +8,7 @@ test: $(TESTFILES:.v=.vo)
.PHONY: test
COQ_TEST=$(COQTOP) $(COQDEBUG) -batch -test-mode
-COQ_BROKEN=$(shell echo "$(COQ_VERSION)" | egrep "^8\.9" > /dev/null && echo 1)
+COQ_BROKEN=$(shell echo "$(COQ_VERSION)" | egrep "^8\.9\b" > /dev/null && echo 1)
# Can't use pipes because that discards error codes and dash provides no way to control that.
# Also egrep errors if it doesn't match anything, we have to ignore that.
@@ -24,14 +24,14 @@ $(TESTFILES:.v=.vo): %.vo: %.v $(if $(MAKE_REF),,%.ref)
$(SHOW)$(if $(MAKE_REF),COQTEST [ref],$(if $(COQ_BROKEN),COQTEST [ignored],COQTEST)) $<
$(HIDE)TEST="$$(basename -s .v $<)" && \
TMPFILE="$$(mktemp)" && \
- $(TIMER) $(COQ_TEST) $(TIMING_ARG) $(COQFLAGS) $(COQLIBS) -load-vernac-source $< $(TIMING_EXTRA) > "$$TMPFILE" && \
+ $(TIMER) $(COQ_TEST) $(COQFLAGS) $(COQLIBS) -load-vernac-source $< > "$$TMPFILE" && \
($(REF_FILTER) < "$$TMPFILE" > "$$TMPFILE.filtered" || true) && \
$(if $(MAKE_REF), \
mv "$$TMPFILE.filtered" "tests/$$TEST.ref", \
$(if $(COQ_BROKEN), \
true, \
diff -u "tests/$$TEST.ref" "$$TMPFILE.filtered" \
- ) \
- ) && \
+ ) \
+ ) && \
rm -f "$$TMPFILE" "$$TMPFILE.filtered" && \
touch $@
diff --git a/opam b/opam
index 5799c2c0d..ff60fd42e 100644
--- a/opam
+++ b/opam
@@ -11,5 +11,5 @@ install: [make "install"]
remove: ["rm" "-rf" "%{lib}%/coq/user-contrib/iris"]
depends: [
"coq" { (>= "8.7.1" & < "8.9~") | (= "dev") }
- "coq-stdpp" { (= "dev.2018-06-30.1.1a21e908") | (= "dev") }
+ "coq-stdpp" { (= "dev.2018-07-23.1.4fb641ed") | (= "dev") }
]
--
GitLab