Commit 52c96f45 authored by Ralf Jung's avatar Ralf Jung

don't check output on testsuite at all when running against 8.9

parent 1244bcfb
...@@ -29,7 +29,6 @@ variables: ...@@ -29,7 +29,6 @@ variables:
build-coq.dev: build-coq.dev:
<<: *template <<: *template
variables: variables:
MAKE_REF: "1" # don't check test output
OPAM_PINS: "coq version dev" OPAM_PINS: "coq version dev"
VALIDATE: "1" VALIDATE: "1"
......
...@@ -8,6 +8,7 @@ test: $(TESTFILES:.v=.vo) ...@@ -8,6 +8,7 @@ test: $(TESTFILES:.v=.vo)
.PHONY: test .PHONY: test
COQ_TEST=$(COQTOP) $(COQDEBUG) -batch -test-mode COQ_TEST=$(COQTOP) $(COQDEBUG) -batch -test-mode
COQ_BROKEN=$(shell echo "$(COQ_VERSION)" | egrep "^8\.9" > /dev/null && echo 1)
# Can't use pipes because that discards error codes and dash provides no way to control that. # 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. # Also egrep errors if it doesn't match anything, we have to ignore that.
...@@ -20,13 +21,16 @@ tests/.coqdeps.d: $(TESTFILES) ...@@ -20,13 +21,16 @@ tests/.coqdeps.d: $(TESTFILES)
-include tests/.coqdeps.d -include tests/.coqdeps.d
$(TESTFILES:.v=.vo): %.vo: %.v $(if $(MAKE_REF),,%.ref) $(TESTFILES:.v=.vo): %.vo: %.v $(if $(MAKE_REF),,%.ref)
$(SHOW)$(if $(MAKE_REF),COQTEST [ref],COQTEST) $< $(SHOW)$(if $(COQ_BROKEN),COQTEST [ignore],$(if $(MAKE_REF),COQTEST [ref],COQTEST)) $<
$(HIDE)TEST="$$(basename -s .v $<)" && \ $(HIDE)TEST="$$(basename -s .v $<)" && \
TMPFILE="$$(mktemp)" && \ TMPFILE="$$(mktemp)" && \
$(TIMER) $(COQ_TEST) $(TIMING_ARG) $(COQFLAGS) $(COQLIBS) -load-vernac-source $< $(TIMING_EXTRA) > "$$TMPFILE" && \ $(TIMER) $(COQ_TEST) $(TIMING_ARG) $(COQFLAGS) $(COQLIBS) -load-vernac-source $< $(TIMING_EXTRA) > "$$TMPFILE" && \
($(REF_FILTER) < "$$TMPFILE" > "$$TMPFILE.filtered" || true) && \ ($(REF_FILTER) < "$$TMPFILE" > "$$TMPFILE.filtered" || true) && \
$(if $(MAKE_REF), \ $(if $(COQ_BROKEN), true, \
mv "$$TMPFILE.filtered" "tests/$$TEST.ref", \ $(if $(MAKE_REF), \
diff -u "tests/$$TEST.ref" "$$TMPFILE.filtered") && \ mv "$$TMPFILE.filtered" "tests/$$TEST.ref", \
diff -u "tests/$$TEST.ref" "$$TMPFILE.filtered" \
) \
) && \
rm -f "$$TMPFILE" "$$TMPFILE.filtered" && \ rm -f "$$TMPFILE" "$$TMPFILE.filtered" && \
touch $@ touch $@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment