matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #714 from rgrinberg/configurator-test-fix 

Configurator test fix
This commit is contained in:
Rudi Grinberg 2018-04-23 17:14:05 +07:00 committed by GitHub
parent 9b7a1707c5 709385ed66
commit f9373b2e46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/blackbox-tests/cram.mll
View File

@ -46,7 +46,15 @@ and postprocess tbl b = parse
] in
(* need to special case exe since we can only remove this extension in
general *)
match var "ext_exe" with
match (
match Configurator.ocaml_config_var config "ext_exe" with
| Some s -> s
| None ->
begin match Configurator.ocaml_config_var_exn config "system" with
| "Win32" -> ".exe"
| _ -> ""
end
) with
| "" -> exts
| ext -> (ext, "") :: exts
in

6
test/blackbox-tests/test-cases/configurator/config/run.ml
View File

@ -1,9 +1,9 @@
module Configurator = Configurator.V1
let () =
begin match Sys.getenv_opt "DUNE_CONFIGURATOR" with
| None -> failwith "DUNE_CONFIGURATOR is not passed"
| Some _ -> print_endline "DUNE_CONFIGURATOR is present"
begin match Sys.getenv "DUNE_CONFIGURATOR" with
| exception Not_found -> failwith "DUNE_CONFIGURATOR is not passed"
| _ -> print_endline "DUNE_CONFIGURATOR is present"
end;
Configurator.main ~name:"config" (fun t ->
match Configurator.ocaml_config_var t "version" with