From 149b0c422027a31972b62457af1bf97bd016e26c Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Sat, 27 May 2017 16:00:53 +0200
Subject: Gitlab CI

---
 test-suite/Makefile                      | 9 +++++----
 test-suite/coq-makefile/template/init.sh | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'test-suite')

diff --git a/test-suite/Makefile b/test-suite/Makefile
index c2d6e540c6..570bf32227 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,9 +488,10 @@ 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 \
+	if [ $$? = 0 ]; then \
 	    echo $(log_success); \
 	    echo "    $<...Ok"; \
 	  else \
diff --git a/test-suite/coq-makefile/template/init.sh b/test-suite/coq-makefile/template/init.sh
index bfd2c1b959..c952d41a30 100644
--- a/test-suite/coq-makefile/template/init.sh
+++ b/test-suite/coq-makefile/template/init.sh
@@ -1,5 +1,5 @@
 
-export PATH=../../../bin/:$PATH
+export PATH=$COQBIN:$PATH
 
 rm -rf theories src Makefile Makefile.conf tmp
 git clean -dfx || true
-- 
cgit v1.2.3