diff options
| author | Ike Mulder | 2019-04-26 16:16:47 +0200 |
|---|---|---|
| committer | Hugo Herbelin | 2020-02-28 05:35:56 +0100 |
| commit | 02b40f6cdb7ec56f34c6b773b1d7768b4b135fd9 (patch) | |
| tree | a36dd7ef9fd751bdeb7a4fbfd4add4ed4d68c2b6 /test-suite | |
| parent | aeca986089d005054496ed4bcf1b920e8fa02173 (diff) | |
Fixed some escaping problems with arguments containing spaces in IDE's Compile buffer, and with building from a path containing spaces.
Updated CHANGES.md
Now using Filename.quote instead of enclosing in single quotes.
Fixed rebasing problems.
Diffstat (limited to 'test-suite')
| -rw-r--r-- | test-suite/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test-suite/Makefile b/test-suite/Makefile index 265c2eafa7..6a6b729578 100644 --- a/test-suite/Makefile +++ b/test-suite/Makefile @@ -33,10 +33,10 @@ include ../Makefile.common ####################################################################### ifneq ($(wildcard ../_build),) -BIN:=$(shell cd ..; pwd)/_build/install/default/bin/ -COQLIB:=$(shell cd ..; pwd)/_build/install/default/lib/coq +BIN:='$(shell cd ..; pwd)'/_build/install/default/bin/ +COQLIB:='$(shell cd ..; pwd)'/_build/install/default/lib/coq else -BIN := $(shell cd ..; pwd)/bin/ +BIN := '$(shell cd ..; pwd)'/bin/ COQLIB?= ifeq ($(COQLIB),) @@ -602,10 +602,10 @@ $(patsubst %.sh,%.log,$(wildcard misc/*.sh)): %.log: %.sh $(PREREQUISITELOG) @echo "TEST $<" $(HIDE){ \ echo $(call log_intro,$<); \ - export BIN="$(BIN)"; \ - export coqc="$(coqc)"; \ - export coqtop="$(coqc)"; \ - export coqdep="$(coqdep)"; \ + export BIN=$(BIN); \ + export coqc="eval $(coqc)"; \ + export coqtop="eval $(coqc)"; \ + export coqdep="eval $(coqdep)"; \ "$<" 2>&1; R=$$?; times; \ if [ $$R = 0 ]; then \ echo $(log_success); \ |