diff options
Diffstat (limited to 'testsuite/tests/typing-misc')
47 files changed, 85 insertions, 77 deletions
diff --git a/testsuite/tests/typing-misc/apply_non_function.ml b/testsuite/tests/typing-misc/apply_non_function.ml index 8ac766a85f..7e768c6473 100644 --- a/testsuite/tests/typing-misc/apply_non_function.ml +++ b/testsuite/tests/typing-misc/apply_non_function.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) let print_lines = List.iter print_endline diff --git a/testsuite/tests/typing-misc/build_as_type.ml b/testsuite/tests/typing-misc/build_as_type.ml index 51aa4e2338..b1b8de7812 100644 --- a/testsuite/tests/typing-misc/build_as_type.ml +++ b/testsuite/tests/typing-misc/build_as_type.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) let f = function diff --git a/testsuite/tests/typing-misc/constraints.ml b/testsuite/tests/typing-misc/constraints.ml index ec6e052319..3550a0b7ec 100644 --- a/testsuite/tests/typing-misc/constraints.ml +++ b/testsuite/tests/typing-misc/constraints.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) type 'a t = [`A of 'a t t] as 'a;; (* fails *) diff --git a/testsuite/tests/typing-misc/deep.ml b/testsuite/tests/typing-misc/deep.ml index 01ade06106..e8d207d55f 100644 --- a/testsuite/tests/typing-misc/deep.ml +++ b/testsuite/tests/typing-misc/deep.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) module M : sig diff --git a/testsuite/tests/typing-misc/disambiguate_principality.ml b/testsuite/tests/typing-misc/disambiguate_principality.ml index d5529524fe..cec00b5c2a 100644 --- a/testsuite/tests/typing-misc/disambiguate_principality.ml +++ b/testsuite/tests/typing-misc/disambiguate_principality.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) (*** Record ***) diff --git a/testsuite/tests/typing-misc/distant_errors.ml b/testsuite/tests/typing-misc/distant_errors.ml index f5f2ffd0fb..ef28cb8dfb 100644 --- a/testsuite/tests/typing-misc/distant_errors.ml +++ b/testsuite/tests/typing-misc/distant_errors.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) (** The aim of this file is to keep track of programs that are "far" from being well-typed *) diff --git a/testsuite/tests/typing-misc/empty_variant.ml b/testsuite/tests/typing-misc/empty_variant.ml index 7aaa1afab4..6b2f7b8205 100644 --- a/testsuite/tests/typing-misc/empty_variant.ml +++ b/testsuite/tests/typing-misc/empty_variant.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) (* empty variant *) diff --git a/testsuite/tests/typing-misc/enrich_typedecl.ml b/testsuite/tests/typing-misc/enrich_typedecl.ml index ac699720d9..34e659cd91 100644 --- a/testsuite/tests/typing-misc/enrich_typedecl.ml +++ b/testsuite/tests/typing-misc/enrich_typedecl.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) module rec A : sig diff --git a/testsuite/tests/typing-misc/exotic_unifications.ml b/testsuite/tests/typing-misc/exotic_unifications.ml index 2e3e69692f..56480999be 100644 --- a/testsuite/tests/typing-misc/exotic_unifications.ml +++ b/testsuite/tests/typing-misc/exotic_unifications.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) class virtual t = object method virtual x: float end diff --git a/testsuite/tests/typing-misc/external_arity.ml b/testsuite/tests/typing-misc/external_arity.ml index bad0fb1729..487fa83563 100644 --- a/testsuite/tests/typing-misc/external_arity.ml +++ b/testsuite/tests/typing-misc/external_arity.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) let f a b c = a + b + c diff --git a/testsuite/tests/typing-misc/filter_params.ml b/testsuite/tests/typing-misc/filter_params.ml index 879693680b..7035dd74e0 100644 --- a/testsuite/tests/typing-misc/filter_params.ml +++ b/testsuite/tests/typing-misc/filter_params.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) type ('a, 'b) t constraint 'a = 'b diff --git a/testsuite/tests/typing-misc/gpr2277.ml b/testsuite/tests/typing-misc/gpr2277.ml index eabd3cc0ca..3d2b8b8d27 100644 --- a/testsuite/tests/typing-misc/gpr2277.ml +++ b/testsuite/tests/typing-misc/gpr2277.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) let f (type t) (x : t) = x diff --git a/testsuite/tests/typing-misc/includeclass_errors.ml b/testsuite/tests/typing-misc/includeclass_errors.ml index 033669e2a5..ddc5d16523 100644 --- a/testsuite/tests/typing-misc/includeclass_errors.ml +++ b/testsuite/tests/typing-misc/includeclass_errors.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) class type foo_t = diff --git a/testsuite/tests/typing-misc/injectivity.ml b/testsuite/tests/typing-misc/injectivity.ml index e6aedfa63d..42fc65d61a 100644 --- a/testsuite/tests/typing-misc/injectivity.ml +++ b/testsuite/tests/typing-misc/injectivity.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) (* Syntax *) diff --git a/testsuite/tests/typing-misc/inside_out.ml b/testsuite/tests/typing-misc/inside_out.ml index 077af37050..541586e4e6 100644 --- a/testsuite/tests/typing-misc/inside_out.ml +++ b/testsuite/tests/typing-misc/inside_out.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) type ('a, 'b) eq = Refl : ('a, 'a) eq diff --git a/testsuite/tests/typing-misc/is_expansive.ml b/testsuite/tests/typing-misc/is_expansive.ml index 3bab4f9378..9a4d66da5e 100644 --- a/testsuite/tests/typing-misc/is_expansive.ml +++ b/testsuite/tests/typing-misc/is_expansive.ml @@ -1,5 +1,6 @@ (* TEST - * expect *) + expect; +*) match [] with x -> (fun x -> x);; [%%expect{| diff --git a/testsuite/tests/typing-misc/labels.ml b/testsuite/tests/typing-misc/labels.ml index 7cb3a7156f..862673752e 100644 --- a/testsuite/tests/typing-misc/labels.ml +++ b/testsuite/tests/typing-misc/labels.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) (* PR#5835 *) diff --git a/testsuite/tests/typing-misc/normalize_type.ml b/testsuite/tests/typing-misc/normalize_type.ml index 0b21b18303..6812764e5d 100644 --- a/testsuite/tests/typing-misc/normalize_type.ml +++ b/testsuite/tests/typing-misc/normalize_type.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) (* #8907 *) diff --git a/testsuite/tests/typing-misc/occur_check.ml b/testsuite/tests/typing-misc/occur_check.ml index 9d681c88a9..7a5d9c6d93 100644 --- a/testsuite/tests/typing-misc/occur_check.ml +++ b/testsuite/tests/typing-misc/occur_check.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) (* PR#5907 *) diff --git a/testsuite/tests/typing-misc/optbinders.ml b/testsuite/tests/typing-misc/optbinders.ml index ab1390675d..01af6bbf0b 100644 --- a/testsuite/tests/typing-misc/optbinders.ml +++ b/testsuite/tests/typing-misc/optbinders.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) (* Optional binders can be used in value declarations, diff --git a/testsuite/tests/typing-misc/pat_type_sharing.ml b/testsuite/tests/typing-misc/pat_type_sharing.ml index 1cbf69641b..4fd5dfa095 100644 --- a/testsuite/tests/typing-misc/pat_type_sharing.ml +++ b/testsuite/tests/typing-misc/pat_type_sharing.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) type 'a r = { a : 'a; b : 'a; } type 'a ty = Int : int ty | Float : float ty;; diff --git a/testsuite/tests/typing-misc/pattern_open.ml b/testsuite/tests/typing-misc/pattern_open.ml index 16572b6eea..9fe25d5452 100644 --- a/testsuite/tests/typing-misc/pattern_open.ml +++ b/testsuite/tests/typing-misc/pattern_open.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) let pp fmt = Format.printf (fmt^^"@.") diff --git a/testsuite/tests/typing-misc/polyvars.ml b/testsuite/tests/typing-misc/polyvars.ml index 714bcf22c4..aaf281ec85 100644 --- a/testsuite/tests/typing-misc/polyvars.ml +++ b/testsuite/tests/typing-misc/polyvars.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) type ab = [ `A | `B ];; diff --git a/testsuite/tests/typing-misc/pr6416.ml b/testsuite/tests/typing-misc/pr6416.ml index 0bfe20a11c..48edc2b2a3 100644 --- a/testsuite/tests/typing-misc/pr6416.ml +++ b/testsuite/tests/typing-misc/pr6416.ml @@ -1,6 +1,6 @@ (* TEST - flags="-no-alias-deps -w +40" - * expect + flags = "-no-alias-deps -w +40"; + expect; *) module M = struct type t = A diff --git a/testsuite/tests/typing-misc/pr6634.ml b/testsuite/tests/typing-misc/pr6634.ml index e96126cfcb..ffac718322 100644 --- a/testsuite/tests/typing-misc/pr6634.ml +++ b/testsuite/tests/typing-misc/pr6634.ml @@ -1,6 +1,6 @@ (* TEST - * expect - *) + expect; +*) type t = int module M : sig type t end with type t = [`T of t] = diff --git a/testsuite/tests/typing-misc/pr6939-flat-float-array.ml b/testsuite/tests/typing-misc/pr6939-flat-float-array.ml index 6c25346006..91ad731705 100644 --- a/testsuite/tests/typing-misc/pr6939-flat-float-array.ml +++ b/testsuite/tests/typing-misc/pr6939-flat-float-array.ml @@ -1,6 +1,6 @@ (* TEST - * flat-float-array - ** expect + flat-float-array; + expect; *) let rec x = [| x |]; 1.;; diff --git a/testsuite/tests/typing-misc/pr6939-no-flat-float-array.ml b/testsuite/tests/typing-misc/pr6939-no-flat-float-array.ml index c511bc625a..a3d139ac39 100644 --- a/testsuite/tests/typing-misc/pr6939-no-flat-float-array.ml +++ b/testsuite/tests/typing-misc/pr6939-no-flat-float-array.ml @@ -1,6 +1,6 @@ (* TEST - * no-flat-float-array - ** expect + no-flat-float-array; + expect; *) let rec x = [| x |]; 1.;; diff --git a/testsuite/tests/typing-misc/pr7103.ml b/testsuite/tests/typing-misc/pr7103.ml index 8156462392..ddb3b61ca7 100644 --- a/testsuite/tests/typing-misc/pr7103.ml +++ b/testsuite/tests/typing-misc/pr7103.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) type 'a t diff --git a/testsuite/tests/typing-misc/pr7228.ml b/testsuite/tests/typing-misc/pr7228.ml index 1e98cca59d..480fa549af 100644 --- a/testsuite/tests/typing-misc/pr7228.ml +++ b/testsuite/tests/typing-misc/pr7228.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) type t = A of {mutable x: int};; diff --git a/testsuite/tests/typing-misc/pr7668_bad.ml b/testsuite/tests/typing-misc/pr7668_bad.ml index e713488696..e9fe766d53 100644 --- a/testsuite/tests/typing-misc/pr7668_bad.ml +++ b/testsuite/tests/typing-misc/pr7668_bad.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) let partition_map f xs = diff --git a/testsuite/tests/typing-misc/pr7712.ml b/testsuite/tests/typing-misc/pr7712.ml index 09ffb4d297..b7ba586bef 100644 --- a/testsuite/tests/typing-misc/pr7712.ml +++ b/testsuite/tests/typing-misc/pr7712.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) type 'a or_error = string diff --git a/testsuite/tests/typing-misc/pr7937.ml b/testsuite/tests/typing-misc/pr7937.ml index af812700fc..4c6ab29906 100644 --- a/testsuite/tests/typing-misc/pr7937.ml +++ b/testsuite/tests/typing-misc/pr7937.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) type 'a r = [< `X of int & 'a ] as 'a diff --git a/testsuite/tests/typing-misc/pr8548.ml b/testsuite/tests/typing-misc/pr8548.ml index 7053ed6817..dd6cac13ef 100644 --- a/testsuite/tests/typing-misc/pr8548.ml +++ b/testsuite/tests/typing-misc/pr8548.ml @@ -1,5 +1,6 @@ (* TEST - * expect *) + expect; +*) module type Endpoint_intf = sig type t diff --git a/testsuite/tests/typing-misc/pr8548_split.ml b/testsuite/tests/typing-misc/pr8548_split.ml index 751dfa5603..5ba2cb09c7 100644 --- a/testsuite/tests/typing-misc/pr8548_split.ml +++ b/testsuite/tests/typing-misc/pr8548_split.ml @@ -1,20 +1,26 @@ (* TEST -readonly_files = "mapping.ml range_intf.ml ranged_intf.ml range.ml ranged.ml" -* setup-ocamlc.byte-build-env -** ocamlc.byte -flags = "-no-alias-deps -w -49 -o Pr8548__Mapping" -module = "mapping.ml" -** ocamlc.byte -flags = "-no-alias-deps -open Pr8548__Mapping -o pr8548__Range_intf.cmo" -module = "range_intf.ml" -*** ocamlc.byte -flags = "-no-alias-deps -open Pr8548__Mapping -o pr8548__Range.cmo" -module = "range.ml" -*** ocamlc.byte -flags = "-no-alias-deps -open Pr8548__Mapping -o pr8548__Ranged_intf.cmo" -module = "ranged_intf.ml" -**** ocamlc.byte -flags = "-no-alias-deps -open Pr8548__Mapping -o pr8548__Ranged.cmo" -module = "ranged.ml" -ocamlc_byte_exit_status = "0" + readonly_files = "mapping.ml range_intf.ml ranged_intf.ml range.ml ranged.ml"; + setup-ocamlc.byte-build-env; + { + flags = "-no-alias-deps -w -49 -o Pr8548__Mapping"; + module = "mapping.ml"; + ocamlc.byte; + }{ + flags = "-no-alias-deps -open Pr8548__Mapping -o pr8548__Range_intf.cmo"; + module = "range_intf.ml"; + ocamlc.byte; + { + flags = "-no-alias-deps -open Pr8548__Mapping -o pr8548__Range.cmo"; + module = "range.ml"; + ocamlc.byte; + }{ + flags = "-no-alias-deps -open Pr8548__Mapping -o pr8548__Ranged_intf.cmo"; + module = "ranged_intf.ml"; + ocamlc.byte; + flags = "-no-alias-deps -open Pr8548__Mapping -o pr8548__Ranged.cmo"; + module = "ranged.ml"; + ocamlc_byte_exit_status = "0"; + ocamlc.byte; + } + } *) diff --git a/testsuite/tests/typing-misc/printing.ml b/testsuite/tests/typing-misc/printing.ml index 1825ec439d..4a7113ff01 100644 --- a/testsuite/tests/typing-misc/printing.ml +++ b/testsuite/tests/typing-misc/printing.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) (* PR#7012 *) diff --git a/testsuite/tests/typing-misc/records.ml b/testsuite/tests/typing-misc/records.ml index 8bdf1988c5..bef54ec4ae 100644 --- a/testsuite/tests/typing-misc/records.ml +++ b/testsuite/tests/typing-misc/records.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) (* undefined labels *) diff --git a/testsuite/tests/typing-misc/scope_escape.ml b/testsuite/tests/typing-misc/scope_escape.ml index 94a47d236e..248cafc167 100644 --- a/testsuite/tests/typing-misc/scope_escape.ml +++ b/testsuite/tests/typing-misc/scope_escape.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) let x = ref [] diff --git a/testsuite/tests/typing-misc/typecore_empty_polyvariant_error.ml b/testsuite/tests/typing-misc/typecore_empty_polyvariant_error.ml index 9b4624d3e2..041f1f8eb0 100644 --- a/testsuite/tests/typing-misc/typecore_empty_polyvariant_error.ml +++ b/testsuite/tests/typing-misc/typecore_empty_polyvariant_error.ml @@ -1,12 +1,12 @@ (* TEST - readonly_files = "empty_ppx.ml" - * setup-ocamlc.byte-build-env - ** ocamlc.byte with ocamlcommon - all_modules="empty_ppx.ml" - program="ppx.exe" - *** toplevel - all_modules="${test_file}" - flags="-ppx '${ocamlrun} ${test_build_directory_prefix}/ocamlc.byte/ppx.exe'" + readonly_files = "empty_ppx.ml"; + setup-ocamlc.byte-build-env; + all_modules = "empty_ppx.ml"; + program = "ppx.exe"; + ocamlc.byte with ocamlcommon; + all_modules = "${test_file}"; + flags = "-ppx '${ocamlrun} ${test_build_directory_prefix}/ocamlc.byte/ppx.exe'"; + toplevel; *) type t = [%empty_polyvar];; diff --git a/testsuite/tests/typing-misc/typecore_errors.ml b/testsuite/tests/typing-misc/typecore_errors.ml index 9b00a4f692..432630f11a 100644 --- a/testsuite/tests/typing-misc/typecore_errors.ml +++ b/testsuite/tests/typing-misc/typecore_errors.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) diff --git a/testsuite/tests/typing-misc/typecore_nolabel_errors.ml b/testsuite/tests/typing-misc/typecore_nolabel_errors.ml index 04ecb52578..d0dcc9d1a6 100644 --- a/testsuite/tests/typing-misc/typecore_nolabel_errors.ml +++ b/testsuite/tests/typing-misc/typecore_nolabel_errors.ml @@ -1,6 +1,6 @@ (* TEST - flags="-nolabels" - * expect + flags = "-nolabels"; + expect; *) diff --git a/testsuite/tests/typing-misc/typetexp_errors.ml b/testsuite/tests/typing-misc/typetexp_errors.ml index 7dc03e90ac..4f71bd478b 100644 --- a/testsuite/tests/typing-misc/typetexp_errors.ml +++ b/testsuite/tests/typing-misc/typetexp_errors.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) type ('a,'at,'any,'en) t = A of 'an diff --git a/testsuite/tests/typing-misc/unbound_type_variables.ml b/testsuite/tests/typing-misc/unbound_type_variables.ml index c00d036079..285d54ae0d 100644 --- a/testsuite/tests/typing-misc/unbound_type_variables.ml +++ b/testsuite/tests/typing-misc/unbound_type_variables.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) type synonym = 'a -> 'a diff --git a/testsuite/tests/typing-misc/unique_names_in_unification.ml b/testsuite/tests/typing-misc/unique_names_in_unification.ml index 18a69f32bd..c1c1d546b6 100644 --- a/testsuite/tests/typing-misc/unique_names_in_unification.ml +++ b/testsuite/tests/typing-misc/unique_names_in_unification.ml @@ -1,6 +1,6 @@ (* TEST - * expect - *) + expect; +*) type t = A let x = A module M = struct diff --git a/testsuite/tests/typing-misc/variance.ml b/testsuite/tests/typing-misc/variance.ml index d0f754f716..d95282886f 100644 --- a/testsuite/tests/typing-misc/variance.ml +++ b/testsuite/tests/typing-misc/variance.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) (* #8698 *) diff --git a/testsuite/tests/typing-misc/variant.ml b/testsuite/tests/typing-misc/variant.ml index b7d5ae8aee..70052e22c3 100644 --- a/testsuite/tests/typing-misc/variant.ml +++ b/testsuite/tests/typing-misc/variant.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) (* PR#6394 *) diff --git a/testsuite/tests/typing-misc/wellfounded.ml b/testsuite/tests/typing-misc/wellfounded.ml index c8820f7ec8..3d0385167f 100644 --- a/testsuite/tests/typing-misc/wellfounded.ml +++ b/testsuite/tests/typing-misc/wellfounded.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) (* PR#6768 *) diff --git a/testsuite/tests/typing-misc/wrong_kind.ml b/testsuite/tests/typing-misc/wrong_kind.ml index 76d1a07688..8638b6a2d2 100644 --- a/testsuite/tests/typing-misc/wrong_kind.ml +++ b/testsuite/tests/typing-misc/wrong_kind.ml @@ -1,5 +1,5 @@ (* TEST - * expect + expect; *) module Constr = struct |