From c2c1f7e74d13bf614a8704de1437d4c789b2c2c9 Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Fri, 1 Sep 2017 10:00:07 +0200
Subject: fix test-suite/coq-makefile/findlib-package on windows

---
 test-suite/coq-makefile/findlib-package/findlib/foo/Makefile | 4 ++--
 test-suite/coq-makefile/findlib-package/run.sh               | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'test-suite')

diff --git a/test-suite/coq-makefile/findlib-package/findlib/foo/Makefile b/test-suite/coq-makefile/findlib-package/findlib/foo/Makefile
index 31cf116652..1615bfd067 100644
--- a/test-suite/coq-makefile/findlib-package/findlib/foo/Makefile
+++ b/test-suite/coq-makefile/findlib-package/findlib/foo/Makefile
@@ -1,7 +1,7 @@
 -include ../../Makefile.conf
 
-CO=$(COQMF_OCAMLFIND) opt
-CB=$(COQMF_OCAMLFIND) ocamlc
+CO="$(COQMF_OCAMLFIND)" opt
+CB="$(COQMF_OCAMLFIND)" ocamlc
 
 all:
 	$(CO) -c foolib.ml
diff --git a/test-suite/coq-makefile/findlib-package/run.sh b/test-suite/coq-makefile/findlib-package/run.sh
index a0d8a7fea7..5b24df6397 100755
--- a/test-suite/coq-makefile/findlib-package/run.sh
+++ b/test-suite/coq-makefile/findlib-package/run.sh
@@ -4,6 +4,11 @@
 
 echo "let () = Foolib.foo ();;" >> src/test_aux.ml
 export OCAMLPATH=$OCAMLPATH:$PWD/findlib
+if which cygpath 2>/dev/null; then
+  # the only way I found to pass OCAMLPATH on win is to have it contain
+  # only one entry
+  export OCAMLPATH=`cygpath -w $PWD/findlib`
+fi
 make -C findlib/foo clean
 coq_makefile -f _CoqProject -o Makefile
 cat Makefile.conf
-- 
cgit v1.2.3