diff options
Diffstat (limited to 'testsuite/tests/warnings')
27 files changed, 377 insertions, 177 deletions
diff --git a/testsuite/tests/warnings/deprecated_module.ml b/testsuite/tests/warnings/deprecated_module.ml index 178483d728..a8ec2c4aef 100644 --- a/testsuite/tests/warnings/deprecated_module.ml +++ b/testsuite/tests/warnings/deprecated_module.ml @@ -1,8 +1,8 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + -flags = "-w +A" -* bytecode *) @@ -15,3 +15,8 @@ end let _ = M.x include M + +(* TEST + flags = "-w +A"; + bytecode; +*) diff --git a/testsuite/tests/warnings/deprecated_module_assigment.ml b/testsuite/tests/warnings/deprecated_module_assigment.ml index c4f9b2b676..68ccd43b95 100644 --- a/testsuite/tests/warnings/deprecated_module_assigment.ml +++ b/testsuite/tests/warnings/deprecated_module_assigment.ml @@ -1,8 +1,8 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + -flags = "-w +A-70" -* bytecode *) @@ -84,3 +84,8 @@ struct module M = struct end [@@deprecated "FOO"] end module MD_OK : sig module M : sig end [@@deprecated] end = struct module M = struct end [@@deprecated "FOO"] end + +(* TEST + flags = "-w +A-70"; + bytecode; +*) diff --git a/testsuite/tests/warnings/deprecated_module_use.ml b/testsuite/tests/warnings/deprecated_module_use.ml index ca582ee1f6..b6a568ad0f 100644 --- a/testsuite/tests/warnings/deprecated_module_use.ml +++ b/testsuite/tests/warnings/deprecated_module_use.ml @@ -1,17 +1,17 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + + + + + + + -modules = "deprecated_module.mli deprecated_module.ml" -* setup-ocamlc.byte-build-env -** ocamlc.byte -flags = "-w -a" -module = "deprecated_module.mli" -*** ocamlc.byte -module = "deprecated_module.ml" -**** ocamlc.byte -flags = "-w +A-70" -module = "deprecated_module_use.ml" -***** check-ocamlc.byte-output *) @@ -21,3 +21,17 @@ type s = M.t open M let _ = x + +(* TEST + modules = "deprecated_module.mli deprecated_module.ml"; + setup-ocamlc.byte-build-env; + flags = "-w -a"; + module = "deprecated_module.mli"; + ocamlc.byte; + module = "deprecated_module.ml"; + ocamlc.byte; + flags = "-w +A-70"; + module = "deprecated_module_use.ml"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/deprecated_mutable.ml b/testsuite/tests/warnings/deprecated_mutable.ml index 78fb12ac41..82ea7ec00b 100644 --- a/testsuite/tests/warnings/deprecated_mutable.ml +++ b/testsuite/tests/warnings/deprecated_mutable.ml @@ -1,8 +1,8 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + -flags = "-w +A-70" -* bytecode *) @@ -11,3 +11,8 @@ type t = {mutable x : int [@deprecated_mutable]} let y : t = {x = 5} let () = y.x <- 42 + +(* TEST + flags = "-w +A-70"; + bytecode; +*) diff --git a/testsuite/tests/warnings/deprecated_warning_specs.ml b/testsuite/tests/warnings/deprecated_warning_specs.ml index ac41e084c1..903b4757c4 100644 --- a/testsuite/tests/warnings/deprecated_warning_specs.ml +++ b/testsuite/tests/warnings/deprecated_warning_specs.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) (** Deprecated sequences of unsigned letters *) diff --git a/testsuite/tests/warnings/mnemonics.mll b/testsuite/tests/warnings/mnemonics.mll index d1225ed0e3..3c6050b312 100644 --- a/testsuite/tests/warnings/mnemonics.mll +++ b/testsuite/tests/warnings/mnemonics.mll @@ -1,7 +1,5 @@ (* TEST - -ocamllex_flags = "-q" - + ocamllex_flags = "-q"; *) { diff --git a/testsuite/tests/warnings/w01.ml b/testsuite/tests/warnings/w01.ml index e72ec1901d..d78b2b5477 100644 --- a/testsuite/tests/warnings/w01.ml +++ b/testsuite/tests/warnings/w01.ml @@ -1,11 +1,11 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + -flags = "-w +A-70" -* setup-ocamlc.byte-build-env -** ocamlc.byte -compile_only = "true" -*** check-ocamlc.byte-output *) @@ -52,3 +52,11 @@ match 1 with (* X *) (* re-re *) + +(* TEST + flags = "-w +A-70"; + setup-ocamlc.byte-build-env; + compile_only = "true"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w03.ml b/testsuite/tests/warnings/w03.ml index d0a581220a..ff5aee7db1 100644 --- a/testsuite/tests/warnings/w03.ml +++ b/testsuite/tests/warnings/w03.ml @@ -1,11 +1,11 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + -flags = "-w +A-70" -* setup-ocamlc.byte-build-env -** ocamlc.byte -compile_only = "true" -*** check-ocamlc.byte-output *) @@ -22,3 +22,11 @@ let _ = B exception C [@deprecated] let _ = B [@warning "-53"] + +(* TEST + flags = "-w +A-70"; + setup-ocamlc.byte-build-env; + compile_only = "true"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w04.ml b/testsuite/tests/warnings/w04.ml index 21a09f52da..b2ddf4c935 100644 --- a/testsuite/tests/warnings/w04.ml +++ b/testsuite/tests/warnings/w04.ml @@ -1,11 +1,11 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + -flags = "-w +A-70" -* setup-ocamlc.byte-build-env -** ocamlc.byte -compile_only = "true" -*** check-ocamlc.byte-output *) @@ -21,3 +21,11 @@ type t = A | B let g x = match x with | A -> 0 | _ -> 1 + +(* TEST + flags = "-w +A-70"; + setup-ocamlc.byte-build-env; + compile_only = "true"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w04_failure.ml b/testsuite/tests/warnings/w04_failure.ml index 0ce23ca0ae..60462390c3 100644 --- a/testsuite/tests/warnings/w04_failure.ml +++ b/testsuite/tests/warnings/w04_failure.ml @@ -1,11 +1,11 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + -flags = "-w +A-70" -* setup-ocamlc.byte-build-env -** ocamlc.byte -compile_only = "true" -*** check-ocamlc.byte-output *) @@ -37,3 +37,11 @@ let silent_fragile2 (type t) (r1 : t repr) (r2 : t repr) (t : t) = | _, XY, X -> () | AB, _, _ -> () | _, XY, _ -> () + +(* TEST + flags = "-w +A-70"; + setup-ocamlc.byte-build-env; + compile_only = "true"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w06.ml b/testsuite/tests/warnings/w06.ml index dc4e6e6a6a..94bf0486de 100644 --- a/testsuite/tests/warnings/w06.ml +++ b/testsuite/tests/warnings/w06.ml @@ -1,11 +1,11 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + -flags = "-w +A-70" -* setup-ocamlc.byte-build-env -** ocamlc.byte -compile_only = "true" -*** check-ocamlc.byte-output *) @@ -15,3 +15,11 @@ let bar ~foo ~baz = ignore (foo, baz) (* two labels *) let () = foo 2 let () = bar 4 2 + +(* TEST + flags = "-w +A-70"; + setup-ocamlc.byte-build-env; + compile_only = "true"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w32.ml b/testsuite/tests/warnings/w32.ml index 1a8e7b7a1d..cbb1630e61 100644 --- a/testsuite/tests/warnings/w32.ml +++ b/testsuite/tests/warnings/w32.ml @@ -1,13 +1,13 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + + + -flags = "-w +A" -* setup-ocamlc.byte-build-env -** ocamlc.byte -module = "w32.mli" -*** ocamlc.byte -module = "w32.ml" -**** check-ocamlc.byte-output *) @@ -69,3 +69,13 @@ module H (X : sig val x : int end) = X module type S = sig module F: sig val x : int end -> sig end end + +(* TEST + flags = "-w +A"; + setup-ocamlc.byte-build-env; + module = "w32.mli"; + ocamlc.byte; + module = "w32.ml"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w32b.ml b/testsuite/tests/warnings/w32b.ml index bcb2fc2588..70f1b861b3 100644 --- a/testsuite/tests/warnings/w32b.ml +++ b/testsuite/tests/warnings/w32b.ml @@ -1,13 +1,21 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + -flags = "-w +A-70" -* setup-ocamlc.byte-build-env -** ocamlc.byte -compile_only = "true" -*** check-ocamlc.byte-output *) (* Check that [t] is considered unused without an .mli file (see GPR#1358) *) module Q (M : sig type t end) = struct end + +(* TEST + flags = "-w +A-70"; + setup-ocamlc.byte-build-env; + compile_only = "true"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w33.ml b/testsuite/tests/warnings/w33.ml index 4c4abfd666..34635c8d39 100644 --- a/testsuite/tests/warnings/w33.ml +++ b/testsuite/tests/warnings/w33.ml @@ -1,11 +1,11 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + -flags = "-w +A-70" -* setup-ocamlc.byte-build-env -** ocamlc.byte -compile_only = "true" -*** check-ocamlc.byte-output *) @@ -25,3 +25,11 @@ let i (A|B) = B open! M (* useless open! *) open M (* useless open *) + +(* TEST + flags = "-w +A-70"; + setup-ocamlc.byte-build-env; + compile_only = "true"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w45.ml b/testsuite/tests/warnings/w45.ml index 01af3e796e..9091842c7f 100644 --- a/testsuite/tests/warnings/w45.ml +++ b/testsuite/tests/warnings/w45.ml @@ -1,11 +1,11 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + -flags = "-w +A-70" -* setup-ocamlc.byte-build-env -** ocamlc.byte -compile_only = "true" -*** check-ocamlc.byte-output *) @@ -25,3 +25,11 @@ module T3 = struct let _ = (A, X) (* X belongs to several types *) end + +(* TEST + flags = "-w +A-70"; + setup-ocamlc.byte-build-env; + compile_only = "true"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w47_inline.ml b/testsuite/tests/warnings/w47_inline.ml index fcdaedc475..30c7cc7101 100644 --- a/testsuite/tests/warnings/w47_inline.ml +++ b/testsuite/tests/warnings/w47_inline.ml @@ -1,11 +1,11 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + -flags = "-w +A-70" -* setup-ocamlc.byte-build-env -** ocamlc.byte -compile_only = "true" -*** check-ocamlc.byte-output *) @@ -39,3 +39,11 @@ let test x = else f5 x in f4 (f6 r) + +(* TEST + flags = "-w +A-70"; + setup-ocamlc.byte-build-env; + compile_only = "true"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w50.ml b/testsuite/tests/warnings/w50.ml index b6e868f89a..a9a1a92329 100644 --- a/testsuite/tests/warnings/w50.ml +++ b/testsuite/tests/warnings/w50.ml @@ -1,11 +1,11 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + -flags = "-w +A-70" -* setup-ocamlc.byte-build-env -** ocamlc.byte -compile_only = "true" -*** check-ocamlc.byte-output *) @@ -16,3 +16,11 @@ module A : sig end = struct module Y1 = X1 end + +(* TEST + flags = "-w +A-70"; + setup-ocamlc.byte-build-env; + compile_only = "true"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w51.ml b/testsuite/tests/warnings/w51.ml index abfee541f4..a471ccffcd 100644 --- a/testsuite/tests/warnings/w51.ml +++ b/testsuite/tests/warnings/w51.ml @@ -1,6 +1,6 @@ (* TEST - flags = "-w +A-70" - * expect + flags = "-w +A-70"; + expect; *) let rec fact = function diff --git a/testsuite/tests/warnings/w51_bis.ml b/testsuite/tests/warnings/w51_bis.ml index bb5bcaac1a..660210627c 100644 --- a/testsuite/tests/warnings/w51_bis.ml +++ b/testsuite/tests/warnings/w51_bis.ml @@ -1,11 +1,11 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + -flags = "-w +A-70" -* setup-ocamlc.byte-build-env -** ocamlc.byte -compile_only = "true" -*** check-ocamlc.byte-output *) @@ -14,3 +14,11 @@ let rec foldl op acc = function | x :: xs -> try (foldl [@tailcall]) op (op x acc) xs with Not_found -> assert false + +(* TEST + flags = "-w +A-70"; + setup-ocamlc.byte-build-env; + compile_only = "true"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w52.ml b/testsuite/tests/warnings/w52.ml index 55204e8cd8..c444c1a458 100644 --- a/testsuite/tests/warnings/w52.ml +++ b/testsuite/tests/warnings/w52.ml @@ -1,6 +1,6 @@ (* TEST - flags = "-w +A" - * expect + flags = "-w +A"; + expect; *) let () = try () with Invalid_argument "Any" -> ();; diff --git a/testsuite/tests/warnings/w53.ml b/testsuite/tests/warnings/w53.ml index 4a31ed446e..545fec18b1 100644 --- a/testsuite/tests/warnings/w53.ml +++ b/testsuite/tests/warnings/w53.ml @@ -1,11 +1,11 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + -flags = "-w +A-60-70" -* setup-ocamlc.byte-build-env -** ocamlc.byte -compile_only = "true" -*** check-ocamlc.byte-output *) @@ -47,3 +47,11 @@ module I' = Set.Make [@ocaml.inlined] module J = Set.Make [@@inlined] module J' = Set.Make [@@ocaml.inlined] + +(* TEST + flags = "-w +A-60-70"; + setup-ocamlc.byte-build-env; + compile_only = "true"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w54.ml b/testsuite/tests/warnings/w54.ml index e9f29cb3e2..80f3b2604c 100644 --- a/testsuite/tests/warnings/w54.ml +++ b/testsuite/tests/warnings/w54.ml @@ -1,11 +1,11 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + -flags = "-w +A-70" -* setup-ocamlc.byte-build-env -** ocamlc.byte -compile_only = "true" -*** check-ocamlc.byte-output *) @@ -17,3 +17,11 @@ let h x = (g [@inlined] [@ocaml.inlined never]) x let v = ((fun x -> x) [@inline] [@inlined]) 1 (* accepted *) let i = ((fun x -> x) [@inline]) [@@inline] + +(* TEST + flags = "-w +A-70"; + setup-ocamlc.byte-build-env; + compile_only = "true"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w55.ml b/testsuite/tests/warnings/w55.ml index d597d46687..9654a0c3e2 100644 --- a/testsuite/tests/warnings/w55.ml +++ b/testsuite/tests/warnings/w55.ml @@ -1,22 +1,22 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + + + + + + + + + + -flags = "-w +A-70" -compile_only = "true" -* setup-ocamlc.byte-build-env -** ocamlc.byte -*** check-ocamlc.byte-output -* no-flambda -** setup-ocamlopt.byte-build-env -*** ocamlopt.byte -**** check-ocamlopt.byte-output -* flambda -compiler_reference = "${test_source_directory}/w55.flambda.reference" -** setup-ocamlopt.byte-build-env -*** ocamlopt.byte -**** check-ocamlopt.byte-output *) @@ -50,3 +50,24 @@ let h' x = (j [@inlined hint]) x let b' x y = (a [@inlined hint]) x y let d' x = (c [@inlined hint]) x + +(* TEST + flags = "-w +A-70"; + compile_only = "true"; + { + setup-ocamlc.byte-build-env; + ocamlc.byte; + check-ocamlc.byte-output; + }{ + no-flambda; + setup-ocamlopt.byte-build-env; + ocamlopt.byte; + check-ocamlopt.byte-output; + }{ + compiler_reference = "${test_source_directory}/w55.flambda.reference"; + flambda; + setup-ocamlopt.byte-build-env; + ocamlopt.byte; + check-ocamlopt.byte-output; + } +*) diff --git a/testsuite/tests/warnings/w58.ml b/testsuite/tests/warnings/w58.ml index cb8ab6194e..401ddf12c8 100644 --- a/testsuite/tests/warnings/w58.ml +++ b/testsuite/tests/warnings/w58.ml @@ -1,22 +1,21 @@ (* TEST - -flags = "-w +A-70" -readonly_files = "module_without_cmx.mli" - -* setup-ocamlc.byte-build-env -** ocamlc.byte -module = "module_without_cmx.mli" -*** ocamlc.byte -module = "w58.ml" -**** check-ocamlc.byte-output - -* setup-ocamlopt.byte-build-env -** ocamlopt.byte -module = "module_without_cmx.mli" -*** ocamlopt.byte -module = "w58.ml" -**** check-ocamlopt.byte-output - + flags = "-w +A-70"; + readonly_files = "module_without_cmx.mli"; + { + setup-ocamlc.byte-build-env; + module = "module_without_cmx.mli"; + ocamlc.byte; + module = "w58.ml"; + ocamlc.byte; + check-ocamlc.byte-output; + }{ + setup-ocamlopt.byte-build-env; + module = "module_without_cmx.mli"; + ocamlopt.byte; + module = "w58.ml"; + ocamlopt.byte; + check-ocamlopt.byte-output; + } *) let () = print_endline (Module_without_cmx.id "Hello World") diff --git a/testsuite/tests/warnings/w59.ml b/testsuite/tests/warnings/w59.ml index 64d4c76fa1..9d8cd4cec8 100644 --- a/testsuite/tests/warnings/w59.ml +++ b/testsuite/tests/warnings/w59.ml @@ -1,23 +1,23 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + + + + + + + + + + + -flags = "-w +A-70" -compile_only = "true" -* setup-ocamlc.byte-build-env -** ocamlc.byte -*** check-ocamlc.byte-output -* no-flambda -** setup-ocamlopt.byte-build-env -*** ocamlopt.byte -**** check-ocamlopt.byte-output -* flambda -compiler_reference = "${test_source_directory}/w59.flambda.reference" -flags = "-w +A-70 -dflambda-invariants" -** setup-ocamlopt.byte-build-env -*** ocamlopt.byte -**** check-ocamlopt.byte-output *) @@ -64,3 +64,25 @@ let set_opaque = (Obj.repr opaque) 0 (Obj.repr 3) + +(* TEST + flags = "-w +A-70"; + compile_only = "true"; + { + setup-ocamlc.byte-build-env; + ocamlc.byte; + check-ocamlc.byte-output; + }{ + no-flambda; + setup-ocamlopt.byte-build-env; + ocamlopt.byte; + check-ocamlopt.byte-output; + }{ + compiler_reference = "${test_source_directory}/w59.flambda.reference"; + flags = "-w +A-70 -dflambda-invariants"; + flambda; + setup-ocamlopt.byte-build-env; + ocamlopt.byte; + check-ocamlopt.byte-output; + } +*) diff --git a/testsuite/tests/warnings/w60.ml b/testsuite/tests/warnings/w60.ml index aeab53db9d..7081bea80c 100644 --- a/testsuite/tests/warnings/w60.ml +++ b/testsuite/tests/warnings/w60.ml @@ -1,11 +1,11 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + -flags = "-w +A-67" -* setup-ocamlc.byte-build-env -** ocamlc.byte -compile_only = "true" -*** check-ocamlc.byte-output *) @@ -39,3 +39,11 @@ let () = (* M is unused, but no warning was emitted before 4.10. *) let module M = struct end in () + +(* TEST + flags = "-w +A-67"; + setup-ocamlc.byte-build-env; + compile_only = "true"; + ocamlc.byte; + check-ocamlc.byte-output; +*) diff --git a/testsuite/tests/warnings/w68.ml b/testsuite/tests/warnings/w68.ml index 4fe03ef788..ffd98ed0f4 100644 --- a/testsuite/tests/warnings/w68.ml +++ b/testsuite/tests/warnings/w68.ml @@ -1,12 +1,12 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + + -flags = "-w +A-70" -* setup-ocamlopt.byte-build-env -** ocamlopt.byte -*** check-ocamlopt.byte-output -**** run -***** check-program-output *) type a = { mutable a : int } @@ -32,3 +32,12 @@ let () = let dont_warn_with_partial_match None x = x + +(* TEST + flags = "-w +A-70"; + setup-ocamlopt.byte-build-env; + ocamlopt.byte; + check-ocamlopt.byte-output; + run; + check-program-output; +*) |