Merge branch 'trunk' into nick-get-copy

1 files changed, 24 insertions, 10 deletions

diff --git a/testsuite/tests/asmcomp/poll_attr_prologue.ml b/testsuite/tests/asmcomp/poll_attr_prologue.ml
index 41b3f6b92f..4e32b79f40 100644
--- a/testsuite/tests/asmcomp/poll_attr_prologue.ml
+++ b/testsuite/tests/asmcomp/poll_attr_prologue.ml
@@ -1,16 +1,30 @@
-(* TEST
-  * setup-ocamlopt.byte-build-env
-  ** ocamlopt.byte
-ocamlopt_byte_exit_status = "2"
-  *** check-ocamlopt.byte-output
-
-  * setup-ocamlopt.opt-build-env
-  ** ocamlopt.opt
-ocamlopt_opt_exit_status = "2"
-  *** check-ocamlopt.opt-output
+(* TEST_BELOW
+(* Blank lines added here to preserve locations. *)
+
+
+
+
+
+
+
+
 *)
 
 let[@poll error] rec c x l =
   match l with
   | [] -> 0
   | _ :: tl -> (c[@tailcall]) (x+1) tl
+
+(* TEST
+ {
+   setup-ocamlopt.byte-build-env;
+   ocamlopt_byte_exit_status = "2";
+   ocamlopt.byte;
+   check-ocamlopt.byte-output;
+ }{
+   setup-ocamlopt.opt-build-env;
+   ocamlopt_opt_exit_status = "2";
+   ocamlopt.opt;
+   check-ocamlopt.opt-output;
+ }
+*)