3 files changed, 46 insertions, 52 deletions
diff --git a/testsuite/tests/output-complete-obj/github9344.ml b/testsuite/tests/output-complete-obj/github9344.ml
index b7ea5c5ec6..cef13069b5 100644
--- a/testsuite/tests/output-complete-obj/github9344.ml
+++ b/testsuite/tests/output-complete-obj/github9344.ml
@@ -1,14 +1,12 @@
 (* TEST
-
-use_runtime = "false"
-
-* setup-ocamlc.byte-build-env
-** ocamlc.byte
-flags = "-w -a -output-complete-exe -ccopt -I${ocamlsrcdir}/runtime"
-program = "github9344"
-*** run
-program = "sh ${test_source_directory}/github9344.sh"
-**** check-program-output
+ use_runtime = "false";
+ setup-ocamlc.byte-build-env;
+ flags = "-w -a -output-complete-exe -ccopt -I${ocamlsrcdir}/runtime";
+ program = "github9344";
+ ocamlc.byte;
+ program = "sh ${test_source_directory}/github9344.sh";
+ run;
+ check-program-output;
 *)
 
 raise Not_found
diff --git a/testsuite/tests/output-complete-obj/test.ml b/testsuite/tests/output-complete-obj/test.ml
index 1b655a6d46..bcdb3965f2 100644
--- a/testsuite/tests/output-complete-obj/test.ml
+++ b/testsuite/tests/output-complete-obj/test.ml
@@ -1,32 +1,30 @@
 (* TEST
-
-readonly_files = "test.ml_stub.c"
-
-* setup-ocamlc.byte-build-env
-** ocamlc.byte
-flags = "-w -a -output-complete-obj"
-program = "test.ml.bc.${objext}"
-*** script
-script = "${mkexe} -I${ocamlsrcdir}/runtime -o test.ml_bc_stub.exe \
-                   test.ml.bc.${objext} ${nativecc_libs} test.ml_stub.c"
-output = "${compiler_output}"
-**** run
-program = "./test.ml_bc_stub.exe"
-stdout = "program-output"
-stderr = "program-output"
-* setup-ocamlopt.byte-build-env
-** ocamlopt.byte
-flags = "-w -a -output-complete-obj"
-program = "test.ml.exe.${objext}"
-*** script
-script = "${mkexe} -I${ocamlsrcdir}/runtime -o test.ml_stub.exe \
-                   test.ml.exe.${objext} ${bytecc_libs} test.ml_stub.c"
-output = "${compiler_output}"
-**** run
-program = "./test.ml_stub.exe"
-stdout = "program-output"
-stderr = "program-output"
-
+ readonly_files = "test.ml_stub.c";
+ {
+   setup-ocamlc.byte-build-env;
+   flags = "-w -a -output-complete-obj";
+   program = "test.ml.bc.${objext}";
+   ocamlc.byte;
+   script = "${mkexe} -I${ocamlsrcdir}/runtime -o test.ml_bc_stub.exe test.ml.bc.${objext} ${nativecc_libs} test.ml_stub.c";
+   output = "${compiler_output}";
+   script;
+   program = "./test.ml_bc_stub.exe";
+   stdout = "program-output";
+   stderr = "program-output";
+   run;
+ }{
+   setup-ocamlopt.byte-build-env;
+   flags = "-w -a -output-complete-obj";
+   program = "test.ml.exe.${objext}";
+   ocamlopt.byte;
+   script = "${mkexe} -I${ocamlsrcdir}/runtime -o test.ml_stub.exe test.ml.exe.${objext} ${bytecc_libs} test.ml_stub.c";
+   output = "${compiler_output}";
+   script;
+   program = "./test.ml_stub.exe";
+   stdout = "program-output";
+   stderr = "program-output";
+   run;
+ }
 *)
 
 let () = Printf.printf "Test!!\n%!"
diff --git a/testsuite/tests/output-complete-obj/test2.ml b/testsuite/tests/output-complete-obj/test2.ml
index c201224ce8..a5b7e3f820 100644
--- a/testsuite/tests/output-complete-obj/test2.ml
+++ b/testsuite/tests/output-complete-obj/test2.ml
@@ -1,18 +1,16 @@
 (* TEST
-
-readonly_files = "puts.c"
-use_runtime = "false"
-unset FOO
-
-* hasunix
-include unix
-** setup-ocamlc.byte-build-env
-*** ocamlc.byte
-flags = "-w -a -output-complete-exe puts.c -ccopt -I${ocamlsrcdir}/runtime"
-program = "test2"
-**** run
-program = "./test2"
-***** check-program-output
+ readonly_files = "puts.c";
+ use_runtime = "false";
+ unset FOO;
+ include unix;
+ hasunix;
+ setup-ocamlc.byte-build-env;
+ flags = "-w -a -output-complete-exe puts.c -ccopt -I${ocamlsrcdir}/runtime";
+ program = "test2";
+ ocamlc.byte;
+ program = "./test2";
+ run;
+ check-program-output;
 *)
 
 external puts: string -> unit = "caml_puts"