From bd860d29e7f64f90ec75d0054fc3aa81686a1c41 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 20 Jul 2018 15:28:27 +0200 Subject: [PATCH] Pass the workspace env to context creation Signed-off-by: Rudi Grinberg --- src/main.ml | 3 ++- test/blackbox-tests/test-cases/workspaces/run.t | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main.ml b/src/main.ml index 5e2a1a51..9a1ee474 100644 --- a/src/main.ml +++ b/src/main.ml @@ -73,7 +73,8 @@ let setup ?(log=Log.no_log) Fiber.parallel_map workspace.contexts ~f:(fun ctx_def -> let name = Workspace.Context.name ctx_def in - Context.create ctx_def ~env ~merlin:(workspace.merlin_context = Some name)) + Context.create ?workspace_env:workspace.env + ctx_def ~env ~merlin:(workspace.merlin_context = Some name)) >>= fun contexts -> let contexts = List.concat contexts in List.iter contexts ~f:(fun (ctx : Context.t) -> diff --git a/test/blackbox-tests/test-cases/workspaces/run.t b/test/blackbox-tests/test-cases/workspaces/run.t index 80b47f0a..8ca726cd 100644 --- a/test/blackbox-tests/test-cases/workspaces/run.t +++ b/test/blackbox-tests/test-cases/workspaces/run.t @@ -53,6 +53,6 @@ Workspaces also allow you to set the env for a context: Entering directory 'workspace-env' ( (flags (-w -40 -machin)) - (ocamlc_flags (-g)) + (ocamlc_flags (-g -verbose)) (ocamlopt_flags (-g)) )