1 files changed, 85 insertions, 38 deletions
diff --git a/testsuite/tests/lib-dynlink-initializers/test10_main.ml b/testsuite/tests/lib-dynlink-initializers/test10_main.ml
index 2ed0a22a8d..8305cd1c35 100644
--- a/testsuite/tests/lib-dynlink-initializers/test10_main.ml
+++ b/testsuite/tests/lib-dynlink-initializers/test10_main.ml
@@ -1,42 +1,42 @@
-(* TEST
+(* TEST_BELOW
+(* Blank lines added here to preserve locations. *)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-include dynlink
-
-readonly_files = "test10_plugin.ml"
-flags += "-g"
-
-libraries = ""
-
-* no-flambda
-** shared-libraries
-*** setup-ocamlc.byte-build-env
-**** ocamlc.byte
-module = "test10_main.ml"
-**** ocamlc.byte
-module = "test10_plugin.ml"
-**** ocamlc.byte
-program = "${test_build_directory}/test10.byte"
-libraries = "dynlink"
-all_modules = "test10_main.cmo"
-***** run
-****** check-program-output
-reference = "${test_source_directory}/test10_main.byte.reference"
-
-*** native-dynlink
-**** setup-ocamlopt.byte-build-env
-***** ocamlopt.byte
-module = "test10_main.ml"
-***** ocamlopt.byte
-program = "test10_plugin.cmxs"
-flags = "-shared"
-all_modules = "test10_plugin.ml"
-***** ocamlopt.byte
-program = "${test_build_directory}/test10.exe"
-libraries = "dynlink"
-all_modules = "test10_main.cmx"
-****** run
-******* check-program-output
-reference = "${test_source_directory}/test10_main.native.reference"
 *)
 
 (* Check that a module in the main program whose initializer has not
@@ -55,3 +55,50 @@ let () =
   | Dynlink.Error (Dynlink.Library's_module_initializers_failed exn) ->
       Printf.eprintf "Error: %s\n%!" (Printexc.to_string exn);
       Printexc.print_backtrace stderr
+
+(* TEST
+ include dynlink;
+ readonly_files = "test10_plugin.ml";
+ flags += "-g";
+ libraries = "";
+ no-flambda;
+ shared-libraries;
+ {
+   setup-ocamlc.byte-build-env;
+   {
+     module = "test10_main.ml";
+     ocamlc.byte;
+   }{
+     module = "test10_plugin.ml";
+     ocamlc.byte;
+   }{
+     program = "${test_build_directory}/test10.byte";
+     libraries = "dynlink";
+     all_modules = "test10_main.cmo";
+     ocamlc.byte;
+     run;
+     reference = "${test_source_directory}/test10_main.byte.reference";
+     check-program-output;
+   }
+ }{
+   native-dynlink;
+   setup-ocamlopt.byte-build-env;
+   {
+     module = "test10_main.ml";
+     ocamlopt.byte;
+   }{
+     program = "test10_plugin.cmxs";
+     flags = "-shared";
+     all_modules = "test10_plugin.ml";
+     ocamlopt.byte;
+   }{
+     program = "${test_build_directory}/test10.exe";
+     libraries = "dynlink";
+     all_modules = "test10_main.cmx";
+     ocamlopt.byte;
+     run;
+     reference = "${test_source_directory}/test10_main.native.reference";
+     check-program-output;
+   }
+ }
+*)