diff options
| author | Hugo Herbelin | 2020-02-28 23:08:05 +0100 |
|---|---|---|
| committer | Hugo Herbelin | 2020-02-28 23:08:05 +0100 |
| commit | 7c1d1a58697486f4f52ac7f45b932d03a7e77e5c (patch) | |
| tree | ce4a5f8cbd17e9dcaed5202b43d946b8a6e1e52d /test-suite | |
| parent | c2d7fbe834031a45e3be4c5cdf93694e109131e9 (diff) | |
| parent | 7462ca3189ceff514bdb919ae7f2908d0f0c0518 (diff) | |
Merge PR #10008: CoqIDE: Fix not escaping coqtop arguments when compiling
Ack-by: ejgallego
Ack-by: gares
Ack-by: herbelin
Diffstat (limited to 'test-suite')
| -rw-r--r-- | test-suite/Makefile | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/test-suite/Makefile b/test-suite/Makefile index 265c2eafa7..1681150f7b 100644 --- a/test-suite/Makefile +++ b/test-suite/Makefile @@ -32,11 +32,15 @@ include ../Makefile.common # Variables ####################################################################### +# Using quotes to anticipate the possibility of spaces in the directory name +# Note that this will later need an eval in shell to interpret the quotes +ROOT='$(shell cd ..; pwd)' + ifneq ($(wildcard ../_build),) -BIN:=$(shell cd ..; pwd)/_build/install/default/bin/ -COQLIB:=$(shell cd ..; pwd)/_build/install/default/lib/coq +BIN:=$(ROOT)/_build/install/default/bin/ +COQLIB:=$(ROOT)/_build/install/default/lib/coq else -BIN := $(shell cd ..; pwd)/bin/ +BIN := $(ROOT)/bin/ COQLIB?= ifeq ($(COQLIB),) @@ -602,10 +606,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); \ |