1 files changed, 44 insertions, 36 deletions
diff --git a/testsuite/tests/lib-dynlink-initializers/test2_main.ml b/testsuite/tests/lib-dynlink-initializers/test2_main.ml
index 6ec8921f09..e1507e7dff 100644
--- a/testsuite/tests/lib-dynlink-initializers/test2_main.ml
+++ b/testsuite/tests/lib-dynlink-initializers/test2_main.ml
@@ -1,40 +1,48 @@
 (* TEST
-
-include dynlink
-
-readonly_files = "test2_inited_first.ml test2_plugin.ml"
-
-libraries = ""
-
-* shared-libraries
-** setup-ocamlc.byte-build-env
-*** ocamlc.byte
-module = "test2_inited_first.ml"
-*** ocamlc.byte
-module = "test2_main.ml"
-*** ocamlc.byte
-module = "test2_plugin.ml"
-*** ocamlc.byte
-program = "${test_build_directory}/test2.byte"
-libraries = "dynlink"
-all_modules = "test2_inited_first.cmo test2_main.cmo"
-**** run
-
-** native-dynlink
-*** setup-ocamlopt.byte-build-env
-**** ocamlopt.byte
-module = "test2_inited_first.ml"
-**** ocamlopt.byte
-module = "test2_main.ml"
-**** ocamlopt.byte
-program = "test2_plugin.cmxs"
-flags = "-shared"
-all_modules = "test2_plugin.ml"
-**** ocamlopt.byte
-program = "${test_build_directory}/test2.exe"
-libraries = "dynlink"
-all_modules = "test2_inited_first.cmx test2_main.cmx"
-***** run
+ include dynlink;
+ readonly_files = "test2_inited_first.ml test2_plugin.ml";
+ libraries = "";
+ shared-libraries;
+ {
+   setup-ocamlc.byte-build-env;
+   {
+     module = "test2_inited_first.ml";
+     ocamlc.byte;
+   }{
+     module = "test2_main.ml";
+     ocamlc.byte;
+   }{
+     module = "test2_plugin.ml";
+     ocamlc.byte;
+   }{
+     program = "${test_build_directory}/test2.byte";
+     libraries = "dynlink";
+     all_modules = "test2_inited_first.cmo test2_main.cmo";
+     ocamlc.byte;
+     run;
+   }
+ }{
+   native-dynlink;
+   setup-ocamlopt.byte-build-env;
+   {
+     module = "test2_inited_first.ml";
+     ocamlopt.byte;
+   }{
+     module = "test2_main.ml";
+     ocamlopt.byte;
+   }{
+     program = "test2_plugin.cmxs";
+     flags = "-shared";
+     all_modules = "test2_plugin.ml";
+     ocamlopt.byte;
+   }{
+     program = "${test_build_directory}/test2.exe";
+     libraries = "dynlink";
+     all_modules = "test2_inited_first.cmx test2_main.cmx";
+     ocamlopt.byte;
+     run;
+   }
+ }
 *)
 
 (* Check that a shared library can refer to a module in the main program