Skip to content

Update "shape" tests to new fomat #2462

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 5 commits into from
Apr 17, 2024
Merged

Update "shape" tests to new fomat #2462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
683d7dd
Update tests to new fomat.
xclerc Apr 17, 2024
759c4b1
Remove temporary files
xclerc Apr 17, 2024
b292b3e
Remove temporary files
xclerc Apr 17, 2024
aaea5b3
Promote tests.
xclerc Apr 17, 2024
7d90586
Copy upstream's header.
xclerc Apr 17, 2024
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
22 changes: 11 additions & 11 deletions ocaml/testsuite/tests/shape-index/index.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
(* TEST
flags = "-bin-annot -bin-annot-occurrences"
compile_only = "true"
readonly_files = "auxiliaire.ml"
* setup-ocamlc.byte-build-env
all_modules = "auxiliaire.ml index.ml"
** ocamlc.byte
*** check-ocamlc.byte-output

program = "-quiet -index -decls index.cmt"
output = "out_objinfo"
flags = "-bin-annot -bin-annot-occurrences";
compile_only = "true";
readonly_files = "auxiliaire.ml";
setup-ocamlc.byte-build-env;
all_modules = "auxiliaire.ml index.ml";
ocamlc.byte;
check-ocamlc.byte-output;

**** ocamlobjinfo
program = "-quiet -index -decls index.cmt";
output = "out_objinfo";
ocamlobjinfo;

**** check-program-output
check-program-output;
*)

module type AS = sig
Expand Down
26 changes: 13 additions & 13 deletions ocaml/testsuite/tests/shape-index/index_aliases.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
(* TEST

flags = "-bin-annot -bin-annot-occurrences"
compile_only = "true"
* setup-ocamlc.byte-build-env
all_modules = "index_aliases.ml"
* ocamlc.byte
** check-ocamlc.byte-output

program = "-quiet -index -decls index_aliases.cmt"
output = "out_objinfo"
*** ocamlobjinfo

**** check-program-output
flags = "-bin-annot -bin-annot-occurrences";
compile_only = "true";
{
all_modules = "index_aliases.ml";
setup-ocamlc.byte-build-env;
}{
ocamlc.byte;
program = "-quiet -index -decls index_aliases.cmt";
output = "out_objinfo";
check-ocamlc.byte-output;
ocamlobjinfo;
check-program-output;
}
*)


Expand Down
23 changes: 10 additions & 13 deletions ocaml/testsuite/tests/shape-index/index_bindingops.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
(* TEST

flags = "-bin-annot -bin-annot-occurrences"
compile_only = "true"
* setup-ocamlc.byte-build-env
all_modules = "index_bindingops.ml"
** ocamlc.byte
*** check-ocamlc.byte-output

program = "-quiet -index -decls index_bindingops.cmt"
output = "out_objinfo"
**** ocamlobjinfo

***** check-program-output
flags = "-bin-annot -bin-annot-occurrences";
compile_only = "true";
all_modules = "index_bindingops.ml";
setup-ocamlc.byte-build-env;
ocamlc.byte;
program = "-quiet -index -decls index_bindingops.cmt";
output = "out_objinfo";
check-ocamlc.byte-output;
ocamlobjinfo;
check-program-output;
*)

let (let+) x f = Option.map f x
Expand Down
44 changes: 22 additions & 22 deletions ocaml/testsuite/tests/shape-index/index_bindingops.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
Indexed shapes:
Resolved: Index_bindingops.3 :
(and+) (File "index_bindingops.ml", line 30, characters 8-14)
(and+) (File "index_bindingops.ml", line 27, characters 8-14)
Resolved: Index_bindingops.0 :
(let+) (File "index_bindingops.ml", line 29, characters 8-14)
(let+) (File "index_bindingops.ml", line 26, characters 8-14)
Resolved: Index_bindingops.11 :
man (File "index_bindingops.ml", line 27, characters 14-17)
man (File "index_bindingops.ml", line 24, characters 14-17)
Resolved: Index_bindingops.10 :
bar (File "index_bindingops.ml", line 27, characters 8-11)
bar (File "index_bindingops.ml", line 24, characters 8-11)
Resolved: Index_bindingops.9 :
foo (File "index_bindingops.ml", line 27, characters 2-5)
foo (File "index_bindingops.ml", line 24, characters 2-5)
Unresolved: CU Stdlib . "+"[value] :
(+) (File "index_bindingops.ml", line 27, characters 6-7)
(+) (File "index_bindingops.ml", line 24, characters 6-7)
Unresolved: CU Stdlib . "-"[value] :
(-) (File "index_bindingops.ml", line 27, characters 12-13)
(-) (File "index_bindingops.ml", line 24, characters 12-13)
Resolved: Index_bindingops.3 :
(and+) (File "index_bindingops.ml", line 26, characters 2-6)
(and+) (File "index_bindingops.ml", line 23, characters 2-6)
Resolved: Index_bindingops.3 :
(and+) (File "index_bindingops.ml", line 25, characters 2-6)
(and+) (File "index_bindingops.ml", line 22, characters 2-6)
Resolved: Index_bindingops.0 :
(let+) (File "index_bindingops.ml", line 24, characters 2-6)
(let+) (File "index_bindingops.ml", line 21, characters 2-6)
Resolved: Index_bindingops.5 :
y (File "index_bindingops.ml", line 21, characters 31-32)
y (File "index_bindingops.ml", line 18, characters 31-32)
Resolved: Index_bindingops.7 :
y (File "index_bindingops.ml", line 21, characters 27-28)
y (File "index_bindingops.ml", line 18, characters 27-28)
Resolved: Index_bindingops.6 :
x (File "index_bindingops.ml", line 21, characters 24-25)
x (File "index_bindingops.ml", line 18, characters 24-25)
Unresolved: CU Stdlib . "Option"[module] . "map"[value] :
Option.map (File "index_bindingops.ml", line 21, characters 2-12)
Option.map (File "index_bindingops.ml", line 18, characters 2-12)
Resolved: Index_bindingops.4 :
x (File "index_bindingops.ml", line 20, characters 14-15)
x (File "index_bindingops.ml", line 17, characters 14-15)
Unresolved: CU Stdlib . "Option"[module] . "bind"[value] :
Option.bind (File "index_bindingops.ml", line 20, characters 2-13)
Option.bind (File "index_bindingops.ml", line 17, characters 2-13)
Resolved: Index_bindingops.1 :
x (File "index_bindingops.ml", line 17, characters 30-31)
x (File "index_bindingops.ml", line 14, characters 30-31)
Resolved: Index_bindingops.2 :
f (File "index_bindingops.ml", line 17, characters 28-29)
f (File "index_bindingops.ml", line 14, characters 28-29)
Unresolved: CU Stdlib . "Option"[module] . "map"[value] :
Option.map (File "index_bindingops.ml", line 17, characters 17-27)
Option.map (File "index_bindingops.ml", line 14, characters 17-27)

Uid of decls:
Index_bindingops.8:
minus_three (File "index_bindingops.ml", line 23, characters 4-15)
minus_three (File "index_bindingops.ml", line 20, characters 4-15)
Index_bindingops.0:
let+ (File "index_bindingops.ml", line 17, characters 4-10)
let+ (File "index_bindingops.ml", line 14, characters 4-10)
Index_bindingops.3:
and+ (File "index_bindingops.ml", line 19, characters 4-10)
and+ (File "index_bindingops.ml", line 16, characters 4-10)
25 changes: 11 additions & 14 deletions ocaml/testsuite/tests/shape-index/index_constrs.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
(* TEST

flags = "-bin-annot -bin-annot-occurrences"
compile_only = "true"
readonly_files = "index_constrs.ml"
* setup-ocamlc.byte-build-env
all_modules = "index_constrs.ml"
** ocamlc.byte
*** check-ocamlc.byte-output

program = "-quiet -index -decls index_constrs.cmt"
output = "out_objinfo"
**** ocamlobjinfo

***** check-program-output
flags = "-bin-annot -bin-annot-occurrences";
compile_only = "true";
readonly_files = "index_constrs.ml";
all_modules = "index_constrs.ml";
setup-ocamlc.byte-build-env;
ocamlc.byte;
program = "-quiet -index -decls index_constrs.cmt";
output = "out_objinfo";
check-ocamlc.byte-output;
ocamlobjinfo;
check-program-output;
*)

exception E
Expand Down
30 changes: 15 additions & 15 deletions ocaml/testsuite/tests/shape-index/index_constrs.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
Indexed shapes:
Resolved: Index_constrs.1 :
M.F (File "index_constrs.ml", line 32, characters 32-35)
M.F (File "index_constrs.ml", line 29, characters 32-35)
Resolved: Index_constrs.0 :
E (File "index_constrs.ml", line 29, characters 14-15)
E (File "index_constrs.ml", line 26, characters 14-15)
Resolved: Index_constrs.4 :
E (File "index_constrs.ml", line 28, characters 4-5)
E (File "index_constrs.ml", line 25, characters 4-5)
Resolved: Index_constrs.7 :
x (File "index_constrs.ml", line 27, characters 16-17)
x (File "index_constrs.ml", line 24, characters 16-17)
Resolved: Index_constrs.0 :
E (File "index_constrs.ml", line 26, characters 15-16)
E (File "index_constrs.ml", line 23, characters 15-16)
Unresolved: CU Stdlib . "raise"[value] :
raise (File "index_constrs.ml", line 26, characters 9-14)
raise (File "index_constrs.ml", line 23, characters 9-14)
Resolved: Index_constrs.4 :
E (File "index_constrs.ml", line 25, characters 9-10)
E (File "index_constrs.ml", line 22, characters 9-10)
Resolved: Index_constrs.0 :
E (File "index_constrs.ml", line 20, characters 16-17)
E (File "index_constrs.ml", line 17, characters 16-17)

Uid of decls:
Index_constrs.6: f (File "index_constrs.ml", line 27, characters 4-5)
Index_constrs.5: x_ (File "index_constrs.ml", line 25, characters 4-6)
Index_constrs.0: E (File "index_constrs.ml", line 18, characters 10-11)
Index_constrs.2: M (File "index_constrs.ml", line 19, characters 7-8)
Index_constrs.1: F (File "index_constrs.ml", line 20, characters 12-13)
Index_constrs.3: t (File "index_constrs.ml", line 23, characters 5-6)
Index_constrs.4: E (File "index_constrs.ml", line 23, characters 9-10)
Index_constrs.6: f (File "index_constrs.ml", line 24, characters 4-5)
Index_constrs.5: x_ (File "index_constrs.ml", line 22, characters 4-6)
Index_constrs.0: E (File "index_constrs.ml", line 15, characters 10-11)
Index_constrs.2: M (File "index_constrs.ml", line 16, characters 7-8)
Index_constrs.1: F (File "index_constrs.ml", line 17, characters 12-13)
Index_constrs.3: t (File "index_constrs.ml", line 20, characters 5-6)
Index_constrs.4: E (File "index_constrs.ml", line 20, characters 9-10)
25 changes: 11 additions & 14 deletions ocaml/testsuite/tests/shape-index/index_constrs_records.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
(* TEST

flags = "-bin-annot -bin-annot-occurrences"
compile_only = "true"
readonly_files = "index_constrs_records.ml"
* setup-ocamlc.byte-build-env
all_modules = "index_constrs_records.ml"
** ocamlc.byte
*** check-ocamlc.byte-output

program = "-quiet -index -decls index_constrs_records.cmt"
output = "out_objinfo"
**** ocamlobjinfo

***** check-program-output
flags = "-bin-annot -bin-annot-occurrences";
compile_only = "true";
readonly_files = "index_constrs_records.ml";
all_modules = "index_constrs_records.ml";
setup-ocamlc.byte-build-env;
ocamlc.byte;
program = "-quiet -index -decls index_constrs_records.cmt";
output = "out_objinfo";
check-ocamlc.byte-output;
ocamlobjinfo;
check-program-output;
*)
type l = { lbl : int }
module M : sig
Expand Down
90 changes: 45 additions & 45 deletions ocaml/testsuite/tests/shape-index/index_constrs_records.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
Indexed shapes:
Resolved: Index_constrs_records.34 :
l_exn (File "index_constrs_records.ml", line 43, characters 21-26)
l_exn (File "index_constrs_records.ml", line 40, characters 21-26)
Resolved: Index_constrs_records.30 :
l_exn (File "index_constrs_records.ml", line 43, characters 10-15)
l_exn (File "index_constrs_records.ml", line 40, characters 10-15)
Resolved: Index_constrs_records.31 :
Exn (File "index_constrs_records.ml", line 43, characters 4-7)
Exn (File "index_constrs_records.ml", line 40, characters 4-7)
Resolved: Index_constrs_records.33 :
e (File "index_constrs_records.ml", line 42, characters 14-15)
e (File "index_constrs_records.ml", line 39, characters 14-15)
Resolved: Index_constrs_records.30 :
l_exn (File "index_constrs_records.ml", line 41, characters 14-19)
l_exn (File "index_constrs_records.ml", line 38, characters 14-19)
Resolved: Index_constrs_records.31 :
Exn (File "index_constrs_records.ml", line 41, characters 8-11)
Exn (File "index_constrs_records.ml", line 38, characters 8-11)
Resolved: Index_constrs_records.29 :
l_ext (File "index_constrs_records.ml", line 36, characters 21-26)
l_ext (File "index_constrs_records.ml", line 33, characters 21-26)
Resolved: Index_constrs_records.24 :
l_ext (File "index_constrs_records.ml", line 36, characters 10-15)
l_ext (File "index_constrs_records.ml", line 33, characters 10-15)
Resolved: Index_constrs_records.25 :
Ext (File "index_constrs_records.ml", line 36, characters 4-7)
Ext (File "index_constrs_records.ml", line 33, characters 4-7)
Resolved: Index_constrs_records.28 :
x (File "index_constrs_records.ml", line 35, characters 22-23)
x (File "index_constrs_records.ml", line 32, characters 22-23)
Resolved: Index_constrs_records.23 :
u (File "index_constrs_records.ml", line 35, characters 11-12)
u (File "index_constrs_records.ml", line 32, characters 11-12)
Resolved: Index_constrs_records.23 :
u (File "index_constrs_records.ml", line 33, characters 5-6)
u (File "index_constrs_records.ml", line 30, characters 5-6)
Resolved: Index_constrs_records.22 :
l (File "index_constrs_records.ml", line 30, characters 47-48)
l (File "index_constrs_records.ml", line 27, characters 47-48)
Resolved: Index_constrs_records.1 :
lbl (File "index_constrs_records.ml", line 30, characters 49-52)
lbl (File "index_constrs_records.ml", line 27, characters 49-52)
Resolved: Index_constrs_records.21 :
lbl (File "index_constrs_records.ml", line 30, characters 41-44)
lbl (File "index_constrs_records.ml", line 27, characters 41-44)
Resolved: Index_constrs_records.20 :
l_c (File "index_constrs_records.ml", line 30, characters 35-38)
l_c (File "index_constrs_records.ml", line 27, characters 35-38)
Unresolved: CU Stdlib . "+"[value] :
(+) (File "index_constrs_records.ml", line 30, characters 39-40)
(+) (File "index_constrs_records.ml", line 27, characters 39-40)
Unresolved: CU Stdlib . "+"[value] :
(+) (File "index_constrs_records.ml", line 30, characters 45-46)
(+) (File "index_constrs_records.ml", line 27, characters 45-46)
Resolved: Index_constrs_records.1 :
lbl (File "index_constrs_records.ml", line 30, characters 21-24)
lbl (File "index_constrs_records.ml", line 27, characters 21-24)
Resolved: Index_constrs_records.3 :
l_c (File "index_constrs_records.ml", line 30, characters 11-14)
l_c (File "index_constrs_records.ml", line 27, characters 11-14)
Resolved: Index_constrs_records.4 :
A (File "index_constrs_records.ml", line 30, characters 7-8)
A (File "index_constrs_records.ml", line 27, characters 7-8)
Resolved: Index_constrs_records.3 :
l_c (File "index_constrs_records.ml", line 29, characters 12-15)
l_c (File "index_constrs_records.ml", line 26, characters 12-15)
Resolved: Index_constrs_records.4 :
A (File "index_constrs_records.ml", line 29, characters 8-9)
A (File "index_constrs_records.ml", line 26, characters 8-9)
Resolved: Index_constrs_records.17 :
M (File "index_constrs_records.ml", line 27, characters 5-6)
M (File "index_constrs_records.ml", line 24, characters 5-6)
Resolved: Index_constrs_records.3 :
l_c (File "index_constrs_records.ml", line 25, characters 14-17)
l_c (File "index_constrs_records.ml", line 22, characters 14-17)
Resolved: Index_constrs_records.4 :
M.A (File "index_constrs_records.ml", line 25, characters 8-11)
M.A (File "index_constrs_records.ml", line 22, characters 8-11)
Resolved: Index_constrs_records.3 :
l_c (File "index_constrs_records.ml", line 22, characters 14-17)
l_c (File "index_constrs_records.ml", line 19, characters 14-17)
Resolved: Index_constrs_records.4 :
A (File "index_constrs_records.ml", line 22, characters 10-11)
A (File "index_constrs_records.ml", line 19, characters 10-11)

Uid of decls:
Index_constrs_records.19:
f (File "index_constrs_records.ml", line 30, characters 4-5)
f (File "index_constrs_records.ml", line 27, characters 4-5)
Index_constrs_records.4:
A (File "index_constrs_records.ml", line 21, characters 11-12)
A (File "index_constrs_records.ml", line 18, characters 11-12)
Index_constrs_records.33:
e (File "index_constrs_records.ml", line 41, characters 4-5)
e (File "index_constrs_records.ml", line 38, characters 4-5)
Index_constrs_records.10:
l_c (File "index_constrs_records.ml", line 19, characters 18-21)
l_c (File "index_constrs_records.ml", line 16, characters 18-21)
Index_constrs_records.2:
t (File "index_constrs_records.ml", line 21, characters 7-8)
t (File "index_constrs_records.ml", line 18, characters 7-8)
Index_constrs_records.25:
Ext (File "index_constrs_records.ml", line 33, characters 10-13)
Ext (File "index_constrs_records.ml", line 30, characters 10-13)
Index_constrs_records.24:
l_ext (File "index_constrs_records.ml", line 33, characters 19-24)
l_ext (File "index_constrs_records.ml", line 30, characters 19-24)
Index_constrs_records.3:
l_c (File "index_constrs_records.ml", line 21, characters 18-21)
l_c (File "index_constrs_records.ml", line 18, characters 18-21)
Index_constrs_records.30:
l_exn (File "index_constrs_records.ml", line 39, characters 18-23)
l_exn (File "index_constrs_records.ml", line 36, characters 18-23)
Index_constrs_records.17:
M (File "index_constrs_records.ml", line 18, characters 7-8)
M (File "index_constrs_records.ml", line 15, characters 7-8)
Index_constrs_records.31:
Exn (File "index_constrs_records.ml", line 39, characters 10-13)
Exn (File "index_constrs_records.ml", line 36, characters 10-13)
Index_constrs_records.11:
A (File "index_constrs_records.ml", line 19, characters 11-12)
A (File "index_constrs_records.ml", line 16, characters 11-12)
Index_constrs_records.27:
f (File "index_constrs_records.ml", line 35, characters 4-5)
f (File "index_constrs_records.ml", line 32, characters 4-5)
Index_constrs_records.9:
t (File "index_constrs_records.ml", line 19, characters 7-8)
t (File "index_constrs_records.ml", line 16, characters 7-8)
Index_constrs_records.0:
l (File "index_constrs_records.ml", line 17, characters 5-6)
l (File "index_constrs_records.ml", line 14, characters 5-6)
Index_constrs_records.23:
u (File "index_constrs_records.ml", line 32, characters 5-6)
u (File "index_constrs_records.ml", line 29, characters 5-6)
Index_constrs_records.1:
lbl (File "index_constrs_records.ml", line 17, characters 11-14)
lbl (File "index_constrs_records.ml", line 14, characters 11-14)
Loading
Loading