summaryrefslogtreecommitdiff
path: root/testsuite/tests/typing-sigsubst
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/tests/typing-sigsubst')
-rw-r--r--testsuite/tests/typing-sigsubst/sig_local_aliases.ml2
-rw-r--r--testsuite/tests/typing-sigsubst/sig_local_aliases_syntax_errors.ml8
-rw-r--r--testsuite/tests/typing-sigsubst/sigsubst.ml2
-rw-r--r--testsuite/tests/typing-sigsubst/test_locations.ml57
4 files changed, 41 insertions, 28 deletions
diff --git a/testsuite/tests/typing-sigsubst/sig_local_aliases.ml b/testsuite/tests/typing-sigsubst/sig_local_aliases.ml
index 096312adfa..a13be7ae85 100644
--- a/testsuite/tests/typing-sigsubst/sig_local_aliases.ml
+++ b/testsuite/tests/typing-sigsubst/sig_local_aliases.ml
@@ -1,5 +1,5 @@
(* TEST
- * expect
+ expect;
*)
module M = struct
diff --git a/testsuite/tests/typing-sigsubst/sig_local_aliases_syntax_errors.ml b/testsuite/tests/typing-sigsubst/sig_local_aliases_syntax_errors.ml
index b387ec6aee..b56f6eebc5 100644
--- a/testsuite/tests/typing-sigsubst/sig_local_aliases_syntax_errors.ml
+++ b/testsuite/tests/typing-sigsubst/sig_local_aliases_syntax_errors.ml
@@ -1,5 +1,5 @@
-(* TEST
- * toplevel
+(* TEST_BELOW
+(* Blank lines added here to preserve locations. *)
*)
module type Rejected1 = sig
@@ -34,3 +34,7 @@ end;;
module type Rejected0 = sig
type nonrec t := int
end;;
+
+(* TEST
+ toplevel;
+*)
diff --git a/testsuite/tests/typing-sigsubst/sigsubst.ml b/testsuite/tests/typing-sigsubst/sigsubst.ml
index 1acad669c2..20f58f038e 100644
--- a/testsuite/tests/typing-sigsubst/sigsubst.ml
+++ b/testsuite/tests/typing-sigsubst/sigsubst.ml
@@ -1,5 +1,5 @@
(* TEST
- * expect
+ expect;
*)
module type Printable = sig
diff --git a/testsuite/tests/typing-sigsubst/test_locations.ml b/testsuite/tests/typing-sigsubst/test_locations.ml
index 4e727100f4..3ad1898195 100644
--- a/testsuite/tests/typing-sigsubst/test_locations.ml
+++ b/testsuite/tests/typing-sigsubst/test_locations.ml
@@ -1,26 +1,35 @@
(* TEST
-readonly_files = "test_functor.ml test_loc_modtype_type_eq.ml \
- test_loc_modtype_type_subst.ml test_loc_type_eq.ml \
- test_loc_type_subst.ml mpr7852.mli"
-* setup-ocamlc.byte-build-env
-** ocamlc.byte
-module = "test_functor.ml"
-** ocamlc.byte
-module = "test_loc_type_eq.ml"
-ocamlc_byte_exit_status = "2"
-** ocamlc.byte
-module = "test_loc_modtype_type_eq.ml"
-ocamlc_byte_exit_status = "2"
-** ocamlc.byte
-module = "test_loc_type_subst.ml"
-ocamlc_byte_exit_status = "2"
-** ocamlc.byte
-module = "test_loc_modtype_type_subst.ml"
-ocamlc_byte_exit_status = "2"
-** check-ocamlc.byte-output
-** ocamlc.byte
-flags = "-w +32"
-module = "mpr7852.mli"
-ocamlc_byte_exit_status = "0"
-** check-ocamlc.byte-output
+ readonly_files = "test_functor.ml test_loc_modtype_type_eq.ml \
+ test_loc_modtype_type_subst.ml test_loc_type_eq.ml test_loc_type_subst.ml \
+ mpr7852.mli";
+ setup-ocamlc.byte-build-env;
+ {
+ module = "test_functor.ml";
+ ocamlc.byte;
+ }{
+ module = "test_loc_type_eq.ml";
+ ocamlc_byte_exit_status = "2";
+ ocamlc.byte;
+ }{
+ module = "test_loc_modtype_type_eq.ml";
+ ocamlc_byte_exit_status = "2";
+ ocamlc.byte;
+ }{
+ module = "test_loc_type_subst.ml";
+ ocamlc_byte_exit_status = "2";
+ ocamlc.byte;
+ }{
+ module = "test_loc_modtype_type_subst.ml";
+ ocamlc_byte_exit_status = "2";
+ ocamlc.byte;
+ }{
+ check-ocamlc.byte-output;
+ }{
+ flags = "-w +32";
+ module = "mpr7852.mli";
+ ocamlc_byte_exit_status = "0";
+ ocamlc.byte;
+ }{
+ check-ocamlc.byte-output;
+ }
*)