diff options
| author | Enrico Tassi | 2019-03-04 15:37:14 +0100 |
|---|---|---|
| committer | Enrico Tassi | 2019-03-04 15:37:14 +0100 |
| commit | be15d32ad16104c81f4fbf42556067848aa0acec (patch) | |
| tree | d0bc31b3bccacd261bd6d3fda6fae2d6f111100d | |
| parent | b4794c19aef3c076472adabdbf7cc78c89d84b74 (diff) | |
| parent | 7b3779b27be9221def05a341d79ddd45540b4280 (diff) | |
Merge PR #9660: Set COQLIB so the test suite runs locally on Windows.
Reviewed-by: ejgallego
Ack-by: SkySkimmer
Ack-by: gares
Ack-by: jfehrle
Ack-by: vbgl
| -rw-r--r-- | test-suite/Makefile | 4 | ||||
| -rw-r--r-- | test-suite/dune | 2 | ||||
| -rw-r--r-- | test-suite/ocaml_pwd.ml | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test-suite/Makefile b/test-suite/Makefile index 5582503d89..6efd47afc2 100644 --- a/test-suite/Makefile +++ b/test-suite/Makefile @@ -38,9 +38,9 @@ include ../Makefile.common BIN := $(shell cd ..; pwd)/bin/ COQFLAGS?= +COQLIB?= ifeq ($(COQLIB),) - # This method of setting `pwd` won't work on win32 OCaml - COQLIB := $(shell cd ..; pwd) + COQLIB := $(shell ocaml ocaml_pwd.ml ..) endif export COQLIB diff --git a/test-suite/dune b/test-suite/dune index 9efc1e2dc1..c430400ba5 100644 --- a/test-suite/dune +++ b/test-suite/dune @@ -6,7 +6,7 @@ (rule (targets libpath.inc) - (action (with-stdout-to %{targets} (run ./ocaml_pwd.exe ../../install/%{context_name}/lib/coq/ )))) + (action (with-stdout-to %{targets} (run ./ocaml_pwd.exe -quoted ../../install/%{context_name}/lib/coq/ )))) (rule (targets summary.log) diff --git a/test-suite/ocaml_pwd.ml b/test-suite/ocaml_pwd.ml index 10ca52a4a9..afa3deea3a 100644 --- a/test-suite/ocaml_pwd.ml +++ b/test-suite/ocaml_pwd.ml @@ -1,7 +1,7 @@ let _ = - let ch_dir = Sys.argv.(1) in + let quoted = Sys.argv.(1) = "-quoted" in + let ch_dir = Sys.argv.(if quoted then 2 else 1) in Sys.chdir ch_dir; let dir = Sys.getcwd () in - (* Needed for windows *) - let dir = Filename.quote dir in + let dir = if quoted then Filename.quote dir else dir in Format.printf "%s%!" dir |