5 files changed, 62 insertions, 26 deletions
diff --git a/testsuite/tests/typing-ocamlc-i/pervasives_leitmotiv.ml b/testsuite/tests/typing-ocamlc-i/pervasives_leitmotiv.ml
index f6ec3f9b1d..32bbfde36d 100644
--- a/testsuite/tests/typing-ocamlc-i/pervasives_leitmotiv.ml
+++ b/testsuite/tests/typing-ocamlc-i/pervasives_leitmotiv.ml
@@ -1,8 +1,8 @@
-(* TEST
-flags = "-i -w +63"
-* setup-ocamlc.byte-build-env
-** ocamlc.byte
-*** check-ocamlc.byte-output
+(* TEST_BELOW
+(* Blank lines added here to preserve locations. *)
+
+
+
 *)
 
 type fpclass = A
@@ -12,3 +12,10 @@ module Stdlib = struct
 end
 
 let f A Stdlib.B = FP_normal
+
+(* TEST
+ flags = "-i -w +63";
+ setup-ocamlc.byte-build-env;
+ ocamlc.byte;
+ check-ocamlc.byte-output;
+*)
diff --git a/testsuite/tests/typing-ocamlc-i/pr4791.ml b/testsuite/tests/typing-ocamlc-i/pr4791.ml
index f781017001..953e44e933 100644
--- a/testsuite/tests/typing-ocamlc-i/pr4791.ml
+++ b/testsuite/tests/typing-ocamlc-i/pr4791.ml
@@ -1,8 +1,8 @@
-(* TEST
-flags = "-i -w +63"
-* setup-ocamlc.byte-build-env
-** ocamlc.byte
-*** check-ocamlc.byte-output
+(* TEST_BELOW
+(* Blank lines added here to preserve locations. *)
+
+
+
 *)
 
 type t = A
@@ -11,3 +11,10 @@ struct
   type t = B
   let f A = B
 end
+
+(* TEST
+ flags = "-i -w +63";
+ setup-ocamlc.byte-build-env;
+ ocamlc.byte;
+ check-ocamlc.byte-output;
+*)
diff --git a/testsuite/tests/typing-ocamlc-i/pr6323.ml b/testsuite/tests/typing-ocamlc-i/pr6323.ml
index 7aff93f1fa..6084550d13 100644
--- a/testsuite/tests/typing-ocamlc-i/pr6323.ml
+++ b/testsuite/tests/typing-ocamlc-i/pr6323.ml
@@ -1,8 +1,8 @@
-(* TEST
-flags = "-i -w +63"
-* setup-ocamlc.byte-build-env
-** ocamlc.byte
-*** check-ocamlc.byte-output
+(* TEST_BELOW
+(* Blank lines added here to preserve locations. *)
+
+
+
 *)
 
 type 'a t = B of 'a t list
@@ -15,3 +15,10 @@ module DT = struct
   type 'a t = {bar : 'a}
   let p t = foo (fun x -> x) t
 end
+
+(* TEST
+ flags = "-i -w +63";
+ setup-ocamlc.byte-build-env;
+ ocamlc.byte;
+ check-ocamlc.byte-output;
+*)
diff --git a/testsuite/tests/typing-ocamlc-i/pr7402.ml b/testsuite/tests/typing-ocamlc-i/pr7402.ml
index b1ccef885e..38b52e8fad 100644
--- a/testsuite/tests/typing-ocamlc-i/pr7402.ml
+++ b/testsuite/tests/typing-ocamlc-i/pr7402.ml
@@ -1,8 +1,8 @@
-(* TEST
-flags = "-i -w +63"
-* setup-ocamlc.byte-build-env
-** ocamlc.byte
-*** check-ocamlc.byte-output
+(* TEST_BELOW
+(* Blank lines added here to preserve locations. *)
+
+
+
 *)
 
 module M: sig type t val v:t end = struct
@@ -17,3 +17,10 @@ module M = struct
 
   let v = M.v
 end
+
+(* TEST
+ flags = "-i -w +63";
+ setup-ocamlc.byte-build-env;
+ ocamlc.byte;
+ check-ocamlc.byte-output;
+*)
diff --git a/testsuite/tests/typing-ocamlc-i/pr7620_bad.ml b/testsuite/tests/typing-ocamlc-i/pr7620_bad.ml
index 25d199a64e..2775db7e9c 100644
--- a/testsuite/tests/typing-ocamlc-i/pr7620_bad.ml
+++ b/testsuite/tests/typing-ocamlc-i/pr7620_bad.ml
@@ -1,11 +1,19 @@
-(* TEST
-flags = "-i"
-ocamlc_byte_exit_status = "2"
-* setup-ocamlc.byte-build-env
-** ocamlc.byte
-*** check-ocamlc.byte-output
+(* TEST_BELOW
+(* Blank lines added here to preserve locations. *)
+
+
+
+
 *)
 
 let t =
   (function `A | `B -> () : 'a) (`A : [`A]);
   (failwith "dummy" : 'a) (* to know how 'a is unified *)
+
+(* TEST
+ flags = "-i";
+ ocamlc_byte_exit_status = "2";
+ setup-ocamlc.byte-build-env;
+ ocamlc.byte;
+ check-ocamlc.byte-output;
+*)