1 files changed, 46 insertions, 40 deletions
diff --git a/testsuite/tests/lib-dynlink-pr6950/loader.ml b/testsuite/tests/lib-dynlink-pr6950/loader.ml
index d676934d1d..f7ba5595af 100644
--- a/testsuite/tests/lib-dynlink-pr6950/loader.ml
+++ b/testsuite/tests/lib-dynlink-pr6950/loader.ml
@@ -1,44 +1,50 @@
 (* TEST
-
-include dynlink
-libraries = ""
-readonly_files = "config.ml b.ml"
-
-* shared-libraries
-** setup-ocamlc.byte-build-env
-*** ocamlc.byte
-program = "plugin.cma"
-flags = "-a"
-all_modules = "config.ml b.ml"
-*** ocamlc.byte
-program = "${test_build_directory}/loader.byte"
-flags = "-linkall"
-include ocamlcommon
-libraries += "dynlink"
-all_modules = "loader.ml"
-**** run
-arguments = "plugin.cma"
-exit_status = "2"
-***** check-program-output
-reference = "${test_source_directory}/byte.reference"
-
-** native-dynlink
-*** setup-ocamlopt.byte-build-env
-**** ocamlopt.byte
-program = "plugin.cmxs"
-flags = "-shared"
-all_modules = "config.ml b.ml"
-**** ocamlopt.byte
-program = "${test_build_directory}/loader.exe"
-flags = "-linkall"
-include ocamlcommon
-libraries += "dynlink"
-all_modules = "loader.ml"
-***** run
-arguments = "plugin.cmxs"
-exit_status = "2"
-****** check-program-output
-reference = "${test_source_directory}/native.reference"
+ include dynlink;
+ libraries = "";
+ readonly_files = "config.ml b.ml";
+ shared-libraries;
+ {
+   setup-ocamlc.byte-build-env;
+   {
+     program = "plugin.cma";
+     flags = "-a";
+     all_modules = "config.ml b.ml";
+     ocamlc.byte;
+   }{
+     program = "${test_build_directory}/loader.byte";
+     flags = "-linkall";
+     include ocamlcommon;
+     libraries += "dynlink";
+     all_modules = "loader.ml";
+     ocamlc.byte;
+     arguments = "plugin.cma";
+     exit_status = "2";
+     run;
+     reference = "${test_source_directory}/byte.reference";
+     check-program-output;
+   }
+ }{
+   native-dynlink;
+   setup-ocamlopt.byte-build-env;
+   {
+     program = "plugin.cmxs";
+     flags = "-shared";
+     all_modules = "config.ml b.ml";
+     ocamlopt.byte;
+   }{
+     program = "${test_build_directory}/loader.exe";
+     flags = "-linkall";
+     include ocamlcommon;
+     libraries += "dynlink";
+     all_modules = "loader.ml";
+     ocamlopt.byte;
+     arguments = "plugin.cmxs";
+     exit_status = "2";
+     run;
+     reference = "${test_source_directory}/native.reference";
+     check-program-output;
+   }
+ }
 *)
 let () =
   try