diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2017-05-29 23:26:23 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2017-05-29 23:26:23 +0200 |
| commit | 0336d4d19d446315cb922149b8ee4e7885843be0 (patch) | |
| tree | 736e7d580a255d2438a5514ea37b609560bb40a3 /test-suite/Makefile | |
| parent | 42c752cf0336cbadc8e9c092ff5aed6a38899dda (diff) | |
| parent | 149b0c422027a31972b62457af1bf97bd016e26c (diff) | |
Merge PR#687: Gitlab CI
Diffstat (limited to 'test-suite/Makefile')
| -rw-r--r-- | test-suite/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test-suite/Makefile b/test-suite/Makefile index b627f680b..285460762 100644 --- a/test-suite/Makefile +++ b/test-suite/Makefile @@ -27,10 +27,10 @@ # Default value when called from a freshly compiled Coq, but can be # easily overridden -BIN := ../bin/ +BIN := $(shell cd ..; readlink -f bin)/ LIB := $(shell cd ..; pwd) -coqtop := $(BIN)coqtop -boot -q -batch -test-mode -R prerequisite TestSuite +coqtop := $(BIN)coqtop -coqlib $(LIB) -boot -q -batch -test-mode -R prerequisite TestSuite coqc := $(BIN)coqc -coqlib $(LIB) -R prerequisite TestSuite coqchk := $(BIN)coqchk -coqlib $(LIB) -R prerequisite TestSuite coqtopbyte := $(BIN)coqtop.byte @@ -440,7 +440,7 @@ ide : $(patsubst %.fake,%.fake.log,$(wildcard ide/*.fake)) @echo "TEST $<" $(HIDE){ \ echo $(call log_intro,$<); \ - $(BIN)fake_ide $< "$(BIN)coqtop -boot -async-proofs on -async-proofs-tactic-error-resilience off -async-proofs-command-error-resilience off" 2>&1; \ + $(BIN)fake_ide $< "$(BIN)coqtop -coqlib $(LIB) -boot -async-proofs on -async-proofs-tactic-error-resilience off -async-proofs-command-error-resilience off" 2>&1; \ if [ $$? = 0 ]; then \ echo $(log_success); \ echo " $<...Ok"; \ @@ -488,6 +488,7 @@ coq-makefile: $(patsubst %/run.sh,%.log,$(wildcard coq-makefile/*/run.sh)) coq-makefile/%.log : coq-makefile/%/run.sh @echo "TEST coq-makefile/$*" $(HIDE)(\ + export COQBIN=$(BIN);\ cd coq-makefile/$* && \ ./run.sh 2>&1; \ if [ $$? = 0 ]; then \ |