Skip to content

Commit

Permalink
flambda-backend: Disable the comparison of bytecode programs (`ocamlt…
Browse files Browse the repository at this point in the history
…est`) (ocaml#128)
  • Loading branch information
xclerc committed Aug 3, 2021
1 parent e650abd commit 9b033c7
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions ocamltest/ocaml_actions.ml
Original file line number Diff line number Diff line change
Expand Up @@ -864,19 +864,26 @@ let compare_programs backend comparison_tool log env =
(Result.pass_with_reason reason, env)
end else really_compare_programs backend comparison_tool log env

let make_bytecode_programs_comparison_tool =
(* See CR in compare_bytecode_programs_code below.
let _make_bytecode_programs_comparison_tool =
let ocamlrun = Ocaml_files.ocamlrun in
let cmpbyt = Ocaml_files.cmpbyt in
let tool_name = ocamlrun ^ " " ^ cmpbyt in
Filecompare.make_comparison_tool tool_name ""
Filecompare.make_comparison_tool tool_name ""*)

let native_programs_comparison_tool = Filecompare.default_comparison_tool

let compare_bytecode_programs_code log env =
let compare_bytecode_programs_code _log env : Result.t * Environments.t =
(* CR xclerc: consider re-enabling the test if it can be made robust enough.
Currently, ocamlc.byte and ocamlc.opt (flambda2) sometimes generate equivalent
cmi files whose contents differ because of sharing; the resulting difference
is propagated through digests to the bytecode executables.
let bytecode_programs_comparison_tool =
make_bytecode_programs_comparison_tool in
compare_programs
Ocaml_backends.Bytecode bytecode_programs_comparison_tool log env
*)
Result.pass_with_reason "comparing of bytecode programs is disabled", env

let compare_bytecode_programs =
native_action
Expand Down

0 comments on commit 9b033c7

Please sign in to comment.