Skip to content

Make expect tests compiler-independent #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 8, 2022
Merged

Make expect tests compiler-independent #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d17dc8
Make expect tests compiler-independent
pitag-ha Mar 31, 2022
e4518c4
Expect-test: keep print_out_value stable
pitag-ha Apr 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions test/expect/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
ppxlib
ppxlib.metaquot
ppxlib.traverse
ppxlib.astlib
findlib.top
ppxlib_ast
;; We don't actually use findlib.dynload, however it is a
Expand Down
23 changes: 22 additions & 1 deletion test/expect/expect_test.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,26 @@ let apply_rewriters : Parsetree.toplevel_phrase -> Parsetree.toplevel_phrase =
Ptop_def (Ppxlib.Selected_ast.to_ocaml Structure s')

let main () =
let rec map_tree = function
| Outcometree.Oval_constr (name, params) ->
Outcometree.Oval_constr (name, List.map ~f:map_tree params)
| Oval_variant (name, Some param) ->
Oval_variant (name, Some (map_tree param))
| Oval_string (s, maxlen, kind) ->
Oval_string (s, (if maxlen < 8 then 8 else maxlen), kind)
| Oval_tuple tl -> Oval_tuple (List.map ~f:map_tree tl)
| Oval_array tl -> Oval_array (List.map ~f:map_tree tl)
| Oval_list tl -> Oval_list (List.map ~f:map_tree tl)
| Oval_record fel ->
Oval_record
(List.map ~f:(fun (name, tree) -> (name, map_tree tree)) fel)
| tree -> tree
in
let print_out_value = !Toploop.print_out_value in
(* Achieve 4.14 printing behaviour, as introduced in
https://github.com/ocaml/ocaml/pull/10565 *)
(Toploop.print_out_value :=
fun ppf tree -> print_out_value ppf (map_tree tree));
run_expect_test Sys.argv.(1) ~f:(fun file_contents lexbuf ->
let chunks = Expect_lexer.split_file ~file_contents lexbuf in

Expand Down Expand Up @@ -87,7 +107,8 @@ let main () =
try
let phr = apply_rewriters phr in
if !Clflags.dump_source then
Format.fprintf ppf "%a@?" Pprintast.top_phrase phr;
Format.fprintf ppf "%a@?" Ppxlib.Pprintast.top_phrase
(Ppxlib.Selected_ast.Of_ocaml.copy_toplevel_phrase phr);
ignore (Toploop.execute_phrase true ppf phr : bool)
with exn -> Location.report_exception ppf exn));
Format.fprintf ppf "@?|}]@.");
Expand Down