1 files changed, 29 insertions, 44 deletions
diff --git a/testsuite/tests/lib-threads/delayintr.ml b/testsuite/tests/lib-threads/delayintr.ml
index 5fcc20143c..924d3179c4 100644
--- a/testsuite/tests/lib-threads/delayintr.ml
+++ b/testsuite/tests/lib-threads/delayintr.ml
@@ -1,48 +1,33 @@
 (* TEST
-
-* hassysthreads
-include systhreads
-
-readonly_files = "sigint.c"
-
-** libunix (* excludes mingw32/64 and msvc32/64 *)
-
-*** setup-ocamlc.byte-build-env
-
-program = "${test_build_directory}/delayintr.byte"
-
-**** ocamlc.byte
-
-program = "sigint"
-all_modules = "sigint.c"
-
-***** ocamlc.byte
-
-program = "${test_build_directory}/delayintr.byte"
-all_modules = "delayintr.ml"
-
-****** check-ocamlc.byte-output
-******* run
-******** check-program-output
-
-*** setup-ocamlopt.byte-build-env
-
-program = "${test_build_directory}/delayintr.opt"
-
-**** ocamlopt.byte
-
-program = "sigint"
-all_modules = "sigint.c"
-
-***** ocamlopt.byte
-
-program = "${test_build_directory}/delayintr.opt"
-all_modules = "delayintr.ml"
-
-****** check-ocamlopt.byte-output
-******* run
-******** check-program-output
-
+ include systhreads;
+ readonly_files = "sigint.c";
+ hassysthreads;
+ libunix; (* excludes mingw32/64 and msvc32/64 *)
+ {
+   program = "${test_build_directory}/delayintr.byte";
+   setup-ocamlc.byte-build-env;
+   program = "sigint";
+   all_modules = "sigint.c";
+   ocamlc.byte;
+   program = "${test_build_directory}/delayintr.byte";
+   all_modules = "delayintr.ml";
+   ocamlc.byte;
+   check-ocamlc.byte-output;
+   run;
+   check-program-output;
+ }{
+   program = "${test_build_directory}/delayintr.opt";
+   setup-ocamlopt.byte-build-env;
+   program = "sigint";
+   all_modules = "sigint.c";
+   ocamlopt.byte;
+   program = "${test_build_directory}/delayintr.opt";
+   all_modules = "delayintr.ml";
+   ocamlopt.byte;
+   check-ocamlopt.byte-output;
+   run;
+   check-program-output;
+ }
 *)
 
 (* Regression test for MPR#7903 *)