diff --git a/test/blackbox-tests/dune.inc b/test/blackbox-tests/dune.inc index b8c3cdae..b3167fc5 100644 --- a/test/blackbox-tests/dune.inc +++ b/test/blackbox-tests/dune.inc @@ -151,6 +151,14 @@ test-cases/env (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected))))) +(alias + (name envs-and-contexts) + (deps (package dune) (source_tree test-cases/envs-and-contexts)) + (action + (chdir + test-cases/envs-and-contexts + (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected))))) + (alias (name exclude-missing-module) (deps (package dune) (source_tree test-cases/exclude-missing-module)) @@ -778,6 +786,7 @@ (alias dune-project-edition) (alias dup-fields) (alias env) + (alias envs-and-contexts) (alias exclude-missing-module) (alias exec-cmd) (alias exec-missing) @@ -873,6 +882,7 @@ (alias dune-project-edition) (alias dup-fields) (alias env) + (alias envs-and-contexts) (alias exclude-missing-module) (alias exec-cmd) (alias exec-missing) diff --git a/test/blackbox-tests/test-cases/envs-and-contexts/dune-project b/test/blackbox-tests/test-cases/envs-and-contexts/dune-project new file mode 100644 index 00000000..6687faf2 --- /dev/null +++ b/test/blackbox-tests/test-cases/envs-and-contexts/dune-project @@ -0,0 +1 @@ +(lang dune 1.1) \ No newline at end of file diff --git a/test/blackbox-tests/test-cases/envs-and-contexts/dune-workspace b/test/blackbox-tests/test-cases/envs-and-contexts/dune-workspace new file mode 100644 index 00000000..4557c44c --- /dev/null +++ b/test/blackbox-tests/test-cases/envs-and-contexts/dune-workspace @@ -0,0 +1,10 @@ +(lang dune 1.1) + +(context (opam (switch default) (name dev) (profile dev) (merlin))) +(context (opam (switch default) (name release) (profile release))) + +(env + (dev + (flags dev-flags)) + (release + (flags release-flags))) diff --git a/test/blackbox-tests/test-cases/envs-and-contexts/run.t b/test/blackbox-tests/test-cases/envs-and-contexts/run.t new file mode 100644 index 00000000..7e1eb276 --- /dev/null +++ b/test/blackbox-tests/test-cases/envs-and-contexts/run.t @@ -0,0 +1,21 @@ +Regression test for https://github.com/ocaml/dune/issues/1016#issuecomment-411390740 + + $ dune printenv + Environment for context dev: + ( + (flags + (-w + @a-4-29-40-41-42-44-45-48-58-59-60-40 + -strict-sequence + -strict-formats + -short-paths + -keep-locs)) + (ocamlc_flags (-g)) + (ocamlopt_flags (-g)) + ) + Environment for context release: + ( + (flags (-w -40)) + (ocamlc_flags (-g)) + (ocamlopt_flags (-g)) + )