Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jonas Kastberg
iris
Commits
52c96f45
Commit
52c96f45
authored
Jun 26, 2018
by
Ralf Jung
Browse files
don't check output on testsuite at all when running against 8.9
parent
1244bcfb
Changes
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
52c96f45
...
...
@@ -29,7 +29,6 @@ variables:
build-coq.dev
:
<<
:
*template
variables
:
MAKE_REF
:
"
1"
# don't check test output
OPAM_PINS
:
"
coq
version
dev"
VALIDATE
:
"
1"
...
...
Makefile.coq.local
View file @
52c96f45
...
...
@@ -8,6 +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
)
# 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.
...
...
@@ -20,13 +21,16 @@ tests/.coqdeps.d: $(TESTFILES)
-include
tests/.coqdeps.d
$(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
$<
)
"
&&
\
TMPFILE
=
"
$
$(mktemp)
"
&&
\
$(TIMER)
$(COQ_TEST)
$(TIMING_ARG)
$(COQFLAGS)
$(COQLIBS)
-load-vernac-source
$<
$(TIMING_EXTRA)
>
"
$$
TMPFILE"
&&
\
(
$(REF_FILTER)
<
"
$$
TMPFILE"
>
"
$$
TMPFILE.filtered"
||
true
)
&&
\
$(
if
$(MAKE_REF)
,
\
mv
"
$$
TMPFILE.filtered"
"tests/
$$
TEST.ref"
,
\
diff
-u
"tests/
$$
TEST.ref"
"
$$
TMPFILE.filtered"
)
&&
\
$(
if
$(COQ_BROKEN)
,
true
,
\
$(
if
$(MAKE_REF)
,
\
mv
"
$$
TMPFILE.filtered"
"tests/
$$
TEST.ref"
,
\
diff
-u
"tests/
$$
TEST.ref"
"
$$
TMPFILE.filtered"
\
)
\
)
&&
\
rm
-f
"
$$
TMPFILE"
"
$$
TMPFILE.filtered"
&&
\
touch
$@
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment