Merge pull request #714 from rgrinberg/configurator-test-fix
Configurator test fix
This commit is contained in:
commit
f9373b2e46
|
@ -46,7 +46,15 @@ and postprocess tbl b = parse
|
||||||
] in
|
] in
|
||||||
(* need to special case exe since we can only remove this extension in
|
(* need to special case exe since we can only remove this extension in
|
||||||
general *)
|
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
|
| "" -> exts
|
||||||
| ext -> (ext, "") :: exts
|
| ext -> (ext, "") :: exts
|
||||||
in
|
in
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
module Configurator = Configurator.V1
|
module Configurator = Configurator.V1
|
||||||
|
|
||||||
let () =
|
let () =
|
||||||
begin match Sys.getenv_opt "DUNE_CONFIGURATOR" with
|
begin match Sys.getenv "DUNE_CONFIGURATOR" with
|
||||||
| None -> failwith "DUNE_CONFIGURATOR is not passed"
|
| exception Not_found -> failwith "DUNE_CONFIGURATOR is not passed"
|
||||||
| Some _ -> print_endline "DUNE_CONFIGURATOR is present"
|
| _ -> print_endline "DUNE_CONFIGURATOR is present"
|
||||||
end;
|
end;
|
||||||
Configurator.main ~name:"config" (fun t ->
|
Configurator.main ~name:"config" (fun t ->
|
||||||
match Configurator.ocaml_config_var t "version" with
|
match Configurator.ocaml_config_var t "version" with
|
||||||
|
|
Loading…
Reference in New Issue