Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clearer error in testsuite when ocamltest missing

master
David Allsopp 2020-09-22 20:40:57 +01:00
parent 7d9e60daa4
commit 3527051e8d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
testsuite/Makefile
View File

@ -52,14 +52,18 @@ else # Windows
endif
endif
ifeq "$(FLEXLINK_ENV)" ""
ocamltest := MKDLL="$(MKDLL)" SORT=$(SORT) MAKE=$(MAKE) $(ocamltest_program)
ifeq "$(ocamltest_program)" ""
ocamltest = $(error ocamltest not found in $(ocamltest_directory))
else
MKDLL=$(WINTOPDIR)/boot/ocamlrun $(WINTOPDIR)/flexdll/flexlink.exe \
$(FLEXLINK_FLAGS)
ifeq "$(FLEXLINK_ENV)" ""
ocamltest := MKDLL="$(MKDLL)" SORT=$(SORT) MAKE=$(MAKE) $(ocamltest_program)
else
MKDLL=$(WINTOPDIR)/boot/ocamlrun $(WINTOPDIR)/flexdll/flexlink.exe \
$(FLEXLINK_FLAGS)
ocamltest := $(FLEXLINK_ENV) MKDLL="$(MKDLL)" SORT=$(SORT) MAKE=$(MAKE) \
$(ocamltest_program)
ocamltest := $(FLEXLINK_ENV) MKDLL="$(MKDLL)" SORT=$(SORT) MAKE=$(MAKE) \
$(ocamltest_program)
endif
endif
# PROMOTE is only meant to be used internally in recursive calls;