summaryrefslogtreecommitdiff
path: root/testsuite/tests/tool-ocaml
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/tests/tool-ocaml')
-rw-r--r--testsuite/tests/tool-ocaml/directive_failure.ml8
-rw-r--r--testsuite/tests/tool-ocaml/t000.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t010-const0.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t010-const1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t010-const2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t010-const3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t011-constint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t020.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t021-pushconst1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t021-pushconst2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t021-pushconst3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t022-pushconstint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t040-makeblock1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t040-makeblock2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t040-makeblock3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t041-makeblock.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t050-getglobal.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t050-pushgetglobal.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t051-getglobalfield.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t051-pushgetglobalfield.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t060-raise.ml12
-rw-r--r--testsuite/tests/tool-ocaml/t070-branch.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t070-branchif.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t070-branchifnot.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t071-boolnot.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t080-eq.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t080-geint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t080-gtint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t080-leint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t080-ltint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t080-neq.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc0.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc4.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc5.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc6.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t090-acc7.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t091-acc.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc0.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc4.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc5.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc6.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t092-pushacc7.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t093-pushacc.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t100-pushtrap.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t101-poptrap.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-addint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-andint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-asrint-1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-asrint-2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-divint-1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-divint-2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-divint-3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-lslint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-lsrint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-modint-1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-modint-2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-mulint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-negint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-offsetint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-orint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-subint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t110-xorint.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t120-getstringchar.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t121-setstringchar.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t130-getvectitem.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t130-vectlength.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t131-setvectitem.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t140-switch-1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t140-switch-2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t140-switch-3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t140-switch-4.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t141-switch-5.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t141-switch-6.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t141-switch-7.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t142-switch-8.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t142-switch-9.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t142-switch-A.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t150-push-1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t150-push-2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t160-closure.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t161-apply1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t162-return.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t163.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t164-apply2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t164-apply3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t165-apply.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t170-envacc2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t170-envacc3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t170-envacc4.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t171-envacc.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t172-pushenvacc1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t172-pushenvacc2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t172-pushenvacc3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t172-pushenvacc4.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t173-pushenvacc.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t180-appterm1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t180-appterm2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t180-appterm3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t181-appterm.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t190-makefloatblock-1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t190-makefloatblock-2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t190-makefloatblock-3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t191-vectlength.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t192-getfloatfield-1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t192-getfloatfield-2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t193-setfloatfield-1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t193-setfloatfield-2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t200-getfield0.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t200-getfield1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t200-getfield2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t200-getfield3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t201-getfield.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t210-setfield0.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t210-setfield1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t210-setfield2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t210-setfield3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t211-setfield.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t220-assign.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t230-check_signals.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t240-c_call1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t240-c_call2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t240-c_call3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t240-c_call4.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t240-c_call5.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t250-closurerec-1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t250-closurerec-2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t251-pushoffsetclosure0.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t251-pushoffsetclosure2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t251-pushoffsetclosurem2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t252-pushoffsetclosure.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t253-offsetclosure0.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t253-offsetclosure2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t253-offsetclosurem2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t254-offsetclosure.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t260-offsetref.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t270-push_retaddr.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t300-getmethod.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t301-object.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t310-alloc-1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t310-alloc-2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t320-gc-1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t320-gc-2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t320-gc-3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t330-compact-1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t330-compact-2.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t330-compact-3.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t330-compact-4.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t340-weak.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t350-heapcheck.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t360-stacks-1.ml10
-rw-r--r--testsuite/tests/tool-ocaml/t360-stacks-2.ml12
158 files changed, 791 insertions, 791 deletions
diff --git a/testsuite/tests/tool-ocaml/directive_failure.ml b/testsuite/tests/tool-ocaml/directive_failure.ml
index e7aa4c6d2d..3c1260ca09 100644
--- a/testsuite/tests/tool-ocaml/directive_failure.ml
+++ b/testsuite/tests/tool-ocaml/directive_failure.ml
@@ -1,8 +1,8 @@
(* TEST
-ocaml_script_as_argument = "true"
-ocaml_exit_status = "125"
-* setup-ocaml-build-env
-** ocaml
+ ocaml_script_as_argument = "true";
+ ocaml_exit_status = "125";
+ setup-ocaml-build-env;
+ ocaml;
*)
#use "no";;
diff --git a/testsuite/tests/tool-ocaml/t000.ml b/testsuite/tests/tool-ocaml/t000.ml
index a8413fb10f..15b068fa6f 100644
--- a/testsuite/tests/tool-ocaml/t000.ml
+++ b/testsuite/tests/tool-ocaml/t000.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
(* empty file *)
diff --git a/testsuite/tests/tool-ocaml/t010-const0.ml b/testsuite/tests/tool-ocaml/t010-const0.ml
index 6216683396..4ee3ca3fa3 100644
--- a/testsuite/tests/tool-ocaml/t010-const0.ml
+++ b/testsuite/tests/tool-ocaml/t010-const0.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
0;;
diff --git a/testsuite/tests/tool-ocaml/t010-const1.ml b/testsuite/tests/tool-ocaml/t010-const1.ml
index a536453d00..73011193e1 100644
--- a/testsuite/tests/tool-ocaml/t010-const1.ml
+++ b/testsuite/tests/tool-ocaml/t010-const1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
1;;
diff --git a/testsuite/tests/tool-ocaml/t010-const2.ml b/testsuite/tests/tool-ocaml/t010-const2.ml
index 7f06a72513..a8200e77e4 100644
--- a/testsuite/tests/tool-ocaml/t010-const2.ml
+++ b/testsuite/tests/tool-ocaml/t010-const2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
2;;
diff --git a/testsuite/tests/tool-ocaml/t010-const3.ml b/testsuite/tests/tool-ocaml/t010-const3.ml
index 92ed01b9a8..db7e14ee82 100644
--- a/testsuite/tests/tool-ocaml/t010-const3.ml
+++ b/testsuite/tests/tool-ocaml/t010-const3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
3;;
diff --git a/testsuite/tests/tool-ocaml/t011-constint.ml b/testsuite/tests/tool-ocaml/t011-constint.ml
index 26a6f1efe3..9b149f330a 100644
--- a/testsuite/tests/tool-ocaml/t011-constint.ml
+++ b/testsuite/tests/tool-ocaml/t011-constint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
4;;
diff --git a/testsuite/tests/tool-ocaml/t020.ml b/testsuite/tests/tool-ocaml/t020.ml
index 3d3c3ff8dc..e7c0dc6649 100644
--- a/testsuite/tests/tool-ocaml/t020.ml
+++ b/testsuite/tests/tool-ocaml/t020.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
let _ = () in ();;
diff --git a/testsuite/tests/tool-ocaml/t021-pushconst1.ml b/testsuite/tests/tool-ocaml/t021-pushconst1.ml
index d315d23dba..a9d028ebb1 100644
--- a/testsuite/tests/tool-ocaml/t021-pushconst1.ml
+++ b/testsuite/tests/tool-ocaml/t021-pushconst1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
let _ = () in 1;;
diff --git a/testsuite/tests/tool-ocaml/t021-pushconst2.ml b/testsuite/tests/tool-ocaml/t021-pushconst2.ml
index df2d22c30a..48d521cf2b 100644
--- a/testsuite/tests/tool-ocaml/t021-pushconst2.ml
+++ b/testsuite/tests/tool-ocaml/t021-pushconst2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
let _ = () in 2;;
diff --git a/testsuite/tests/tool-ocaml/t021-pushconst3.ml b/testsuite/tests/tool-ocaml/t021-pushconst3.ml
index c07111e952..fd1a31fb9b 100644
--- a/testsuite/tests/tool-ocaml/t021-pushconst3.ml
+++ b/testsuite/tests/tool-ocaml/t021-pushconst3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
let _ = () in 3;;
diff --git a/testsuite/tests/tool-ocaml/t022-pushconstint.ml b/testsuite/tests/tool-ocaml/t022-pushconstint.ml
index bdb708d2e9..7fb3c3c715 100644
--- a/testsuite/tests/tool-ocaml/t022-pushconstint.ml
+++ b/testsuite/tests/tool-ocaml/t022-pushconstint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
let _ = () in -1;;
diff --git a/testsuite/tests/tool-ocaml/t040-makeblock1.ml b/testsuite/tests/tool-ocaml/t040-makeblock1.ml
index 1c52df3085..da56950b28 100644
--- a/testsuite/tests/tool-ocaml/t040-makeblock1.ml
+++ b/testsuite/tests/tool-ocaml/t040-makeblock1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
type t = {
diff --git a/testsuite/tests/tool-ocaml/t040-makeblock2.ml b/testsuite/tests/tool-ocaml/t040-makeblock2.ml
index e96a8b67cd..e6222e3225 100644
--- a/testsuite/tests/tool-ocaml/t040-makeblock2.ml
+++ b/testsuite/tests/tool-ocaml/t040-makeblock2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
type t = {
diff --git a/testsuite/tests/tool-ocaml/t040-makeblock3.ml b/testsuite/tests/tool-ocaml/t040-makeblock3.ml
index a2083304ef..c8ff9e44fc 100644
--- a/testsuite/tests/tool-ocaml/t040-makeblock3.ml
+++ b/testsuite/tests/tool-ocaml/t040-makeblock3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
type t = {
diff --git a/testsuite/tests/tool-ocaml/t041-makeblock.ml b/testsuite/tests/tool-ocaml/t041-makeblock.ml
index 8d70bb630b..57b8d68785 100644
--- a/testsuite/tests/tool-ocaml/t041-makeblock.ml
+++ b/testsuite/tests/tool-ocaml/t041-makeblock.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
type t = {
diff --git a/testsuite/tests/tool-ocaml/t050-getglobal.ml b/testsuite/tests/tool-ocaml/t050-getglobal.ml
index cbd7ee1ad8..c5f636c357 100644
--- a/testsuite/tests/tool-ocaml/t050-getglobal.ml
+++ b/testsuite/tests/tool-ocaml/t050-getglobal.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
[1];;
diff --git a/testsuite/tests/tool-ocaml/t050-pushgetglobal.ml b/testsuite/tests/tool-ocaml/t050-pushgetglobal.ml
index e112327967..c0262a9468 100644
--- a/testsuite/tests/tool-ocaml/t050-pushgetglobal.ml
+++ b/testsuite/tests/tool-ocaml/t050-pushgetglobal.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
let _ = () in 0.01;;
diff --git a/testsuite/tests/tool-ocaml/t051-getglobalfield.ml b/testsuite/tests/tool-ocaml/t051-getglobalfield.ml
index a78a5e8e46..9e16ebdb09 100644
--- a/testsuite/tests/tool-ocaml/t051-getglobalfield.ml
+++ b/testsuite/tests/tool-ocaml/t051-getglobalfield.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
Lib.x;;
diff --git a/testsuite/tests/tool-ocaml/t051-pushgetglobalfield.ml b/testsuite/tests/tool-ocaml/t051-pushgetglobalfield.ml
index 26c1e0d1b7..182eb83f2b 100644
--- a/testsuite/tests/tool-ocaml/t051-pushgetglobalfield.ml
+++ b/testsuite/tests/tool-ocaml/t051-pushgetglobalfield.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
let _ = () in Lib.x;;
diff --git a/testsuite/tests/tool-ocaml/t060-raise.ml b/testsuite/tests/tool-ocaml/t060-raise.ml
index 1bee8b2d20..0a116e8198 100644
--- a/testsuite/tests/tool-ocaml/t060-raise.ml
+++ b/testsuite/tests/tool-ocaml/t060-raise.ml
@@ -1,10 +1,10 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-ocaml_exit_status = "2"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ ocaml_exit_status = "2";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t070-branch.ml b/testsuite/tests/tool-ocaml/t070-branch.ml
index 8a58e20e8c..1d7570aba3 100644
--- a/testsuite/tests/tool-ocaml/t070-branch.ml
+++ b/testsuite/tests/tool-ocaml/t070-branch.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t070-branchif.ml b/testsuite/tests/tool-ocaml/t070-branchif.ml
index a231f04110..9650d404ef 100644
--- a/testsuite/tests/tool-ocaml/t070-branchif.ml
+++ b/testsuite/tests/tool-ocaml/t070-branchif.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t070-branchifnot.ml b/testsuite/tests/tool-ocaml/t070-branchifnot.ml
index 578380b1f1..cb1fd166e6 100644
--- a/testsuite/tests/tool-ocaml/t070-branchifnot.ml
+++ b/testsuite/tests/tool-ocaml/t070-branchifnot.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t071-boolnot.ml b/testsuite/tests/tool-ocaml/t071-boolnot.ml
index 3400655bff..db814ba4a4 100644
--- a/testsuite/tests/tool-ocaml/t071-boolnot.ml
+++ b/testsuite/tests/tool-ocaml/t071-boolnot.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t080-eq.ml b/testsuite/tests/tool-ocaml/t080-eq.ml
index b8fc6455c3..fb1c1429ed 100644
--- a/testsuite/tests/tool-ocaml/t080-eq.ml
+++ b/testsuite/tests/tool-ocaml/t080-eq.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t080-geint.ml b/testsuite/tests/tool-ocaml/t080-geint.ml
index d604fed654..9dd65a40fe 100644
--- a/testsuite/tests/tool-ocaml/t080-geint.ml
+++ b/testsuite/tests/tool-ocaml/t080-geint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t080-gtint.ml b/testsuite/tests/tool-ocaml/t080-gtint.ml
index df53f75199..be75d3bc20 100644
--- a/testsuite/tests/tool-ocaml/t080-gtint.ml
+++ b/testsuite/tests/tool-ocaml/t080-gtint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t080-leint.ml b/testsuite/tests/tool-ocaml/t080-leint.ml
index b78aa3a5db..68295f154a 100644
--- a/testsuite/tests/tool-ocaml/t080-leint.ml
+++ b/testsuite/tests/tool-ocaml/t080-leint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t080-ltint.ml b/testsuite/tests/tool-ocaml/t080-ltint.ml
index 9737ad1a33..0135b8000f 100644
--- a/testsuite/tests/tool-ocaml/t080-ltint.ml
+++ b/testsuite/tests/tool-ocaml/t080-ltint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t080-neq.ml b/testsuite/tests/tool-ocaml/t080-neq.ml
index b1c33aec21..f3510719b7 100644
--- a/testsuite/tests/tool-ocaml/t080-neq.ml
+++ b/testsuite/tests/tool-ocaml/t080-neq.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t090-acc0.ml b/testsuite/tests/tool-ocaml/t090-acc0.ml
index 0b398c26ea..1892888dbc 100644
--- a/testsuite/tests/tool-ocaml/t090-acc0.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc0.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t090-acc1.ml b/testsuite/tests/tool-ocaml/t090-acc1.ml
index 8a4dcd1711..823213a9ef 100644
--- a/testsuite/tests/tool-ocaml/t090-acc1.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t090-acc2.ml b/testsuite/tests/tool-ocaml/t090-acc2.ml
index 708da881fe..9bb080af8c 100644
--- a/testsuite/tests/tool-ocaml/t090-acc2.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t090-acc3.ml b/testsuite/tests/tool-ocaml/t090-acc3.ml
index 9474236d43..445b24f445 100644
--- a/testsuite/tests/tool-ocaml/t090-acc3.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t090-acc4.ml b/testsuite/tests/tool-ocaml/t090-acc4.ml
index 673694d059..e272351663 100644
--- a/testsuite/tests/tool-ocaml/t090-acc4.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc4.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t090-acc5.ml b/testsuite/tests/tool-ocaml/t090-acc5.ml
index f270f5fc17..0e7bd171c0 100644
--- a/testsuite/tests/tool-ocaml/t090-acc5.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc5.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t090-acc6.ml b/testsuite/tests/tool-ocaml/t090-acc6.ml
index b1d0e83303..35999f0282 100644
--- a/testsuite/tests/tool-ocaml/t090-acc6.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc6.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t090-acc7.ml b/testsuite/tests/tool-ocaml/t090-acc7.ml
index 64e61e791b..689e9d3164 100644
--- a/testsuite/tests/tool-ocaml/t090-acc7.ml
+++ b/testsuite/tests/tool-ocaml/t090-acc7.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t091-acc.ml b/testsuite/tests/tool-ocaml/t091-acc.ml
index be3c73ebca..999dca3a3a 100644
--- a/testsuite/tests/tool-ocaml/t091-acc.ml
+++ b/testsuite/tests/tool-ocaml/t091-acc.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc.ml b/testsuite/tests/tool-ocaml/t092-pushacc.ml
index 26a414b3b5..26931f8723 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc0.ml b/testsuite/tests/tool-ocaml/t092-pushacc0.ml
index 7199799b90..7d6bd2e6b6 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc0.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc0.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc1.ml b/testsuite/tests/tool-ocaml/t092-pushacc1.ml
index d6e34cee03..0a7d450727 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc1.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc2.ml b/testsuite/tests/tool-ocaml/t092-pushacc2.ml
index 2f1b641bab..ed2adb2f9a 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc2.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc3.ml b/testsuite/tests/tool-ocaml/t092-pushacc3.ml
index c0bc7fcd99..95553e0911 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc3.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc4.ml b/testsuite/tests/tool-ocaml/t092-pushacc4.ml
index 07dd054eee..84b7d5aff9 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc4.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc4.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc5.ml b/testsuite/tests/tool-ocaml/t092-pushacc5.ml
index 57c6213e5f..746d0eeec2 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc5.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc5.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc6.ml b/testsuite/tests/tool-ocaml/t092-pushacc6.ml
index 01304d6a66..4d14f8c80f 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc6.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc6.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t092-pushacc7.ml b/testsuite/tests/tool-ocaml/t092-pushacc7.ml
index befef4c2f6..ba648b245c 100644
--- a/testsuite/tests/tool-ocaml/t092-pushacc7.ml
+++ b/testsuite/tests/tool-ocaml/t092-pushacc7.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t093-pushacc.ml b/testsuite/tests/tool-ocaml/t093-pushacc.ml
index efd8d8d8d9..9d35dd38cc 100644
--- a/testsuite/tests/tool-ocaml/t093-pushacc.ml
+++ b/testsuite/tests/tool-ocaml/t093-pushacc.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t100-pushtrap.ml b/testsuite/tests/tool-ocaml/t100-pushtrap.ml
index 586e720d01..28abb4caf5 100644
--- a/testsuite/tests/tool-ocaml/t100-pushtrap.ml
+++ b/testsuite/tests/tool-ocaml/t100-pushtrap.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t101-poptrap.ml b/testsuite/tests/tool-ocaml/t101-poptrap.ml
index 842ec08962..5e00863941 100644
--- a/testsuite/tests/tool-ocaml/t101-poptrap.ml
+++ b/testsuite/tests/tool-ocaml/t101-poptrap.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-addint.ml b/testsuite/tests/tool-ocaml/t110-addint.ml
index cc31dc6166..1d689ff180 100644
--- a/testsuite/tests/tool-ocaml/t110-addint.ml
+++ b/testsuite/tests/tool-ocaml/t110-addint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-andint.ml b/testsuite/tests/tool-ocaml/t110-andint.ml
index 52497d319c..4999cd1119 100644
--- a/testsuite/tests/tool-ocaml/t110-andint.ml
+++ b/testsuite/tests/tool-ocaml/t110-andint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-asrint-1.ml b/testsuite/tests/tool-ocaml/t110-asrint-1.ml
index fe700edc29..0933bea1cb 100644
--- a/testsuite/tests/tool-ocaml/t110-asrint-1.ml
+++ b/testsuite/tests/tool-ocaml/t110-asrint-1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-asrint-2.ml b/testsuite/tests/tool-ocaml/t110-asrint-2.ml
index 9f15bde01f..65dcb1fce6 100644
--- a/testsuite/tests/tool-ocaml/t110-asrint-2.ml
+++ b/testsuite/tests/tool-ocaml/t110-asrint-2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-divint-1.ml b/testsuite/tests/tool-ocaml/t110-divint-1.ml
index 0e1208abe1..59dceadc49 100644
--- a/testsuite/tests/tool-ocaml/t110-divint-1.ml
+++ b/testsuite/tests/tool-ocaml/t110-divint-1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-divint-2.ml b/testsuite/tests/tool-ocaml/t110-divint-2.ml
index eabec84efd..39bb0b38aa 100644
--- a/testsuite/tests/tool-ocaml/t110-divint-2.ml
+++ b/testsuite/tests/tool-ocaml/t110-divint-2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-divint-3.ml b/testsuite/tests/tool-ocaml/t110-divint-3.ml
index d17e1350a0..8dde42dac9 100644
--- a/testsuite/tests/tool-ocaml/t110-divint-3.ml
+++ b/testsuite/tests/tool-ocaml/t110-divint-3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-lslint.ml b/testsuite/tests/tool-ocaml/t110-lslint.ml
index fc903ef8fe..2b4e56f2b3 100644
--- a/testsuite/tests/tool-ocaml/t110-lslint.ml
+++ b/testsuite/tests/tool-ocaml/t110-lslint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-lsrint.ml b/testsuite/tests/tool-ocaml/t110-lsrint.ml
index 348a2b6a3e..ec1f0023ca 100644
--- a/testsuite/tests/tool-ocaml/t110-lsrint.ml
+++ b/testsuite/tests/tool-ocaml/t110-lsrint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-modint-1.ml b/testsuite/tests/tool-ocaml/t110-modint-1.ml
index 0bfb65defa..a5e2553188 100644
--- a/testsuite/tests/tool-ocaml/t110-modint-1.ml
+++ b/testsuite/tests/tool-ocaml/t110-modint-1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-modint-2.ml b/testsuite/tests/tool-ocaml/t110-modint-2.ml
index e2ea7c29a8..3835861df2 100644
--- a/testsuite/tests/tool-ocaml/t110-modint-2.ml
+++ b/testsuite/tests/tool-ocaml/t110-modint-2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-mulint.ml b/testsuite/tests/tool-ocaml/t110-mulint.ml
index bae1ffb610..49faaa8857 100644
--- a/testsuite/tests/tool-ocaml/t110-mulint.ml
+++ b/testsuite/tests/tool-ocaml/t110-mulint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-negint.ml b/testsuite/tests/tool-ocaml/t110-negint.ml
index 770a2ee81f..470466e752 100644
--- a/testsuite/tests/tool-ocaml/t110-negint.ml
+++ b/testsuite/tests/tool-ocaml/t110-negint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-offsetint.ml b/testsuite/tests/tool-ocaml/t110-offsetint.ml
index 9b74667e4f..08db4246cb 100644
--- a/testsuite/tests/tool-ocaml/t110-offsetint.ml
+++ b/testsuite/tests/tool-ocaml/t110-offsetint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-orint.ml b/testsuite/tests/tool-ocaml/t110-orint.ml
index 8551be84b6..99c3bd1f4c 100644
--- a/testsuite/tests/tool-ocaml/t110-orint.ml
+++ b/testsuite/tests/tool-ocaml/t110-orint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-subint.ml b/testsuite/tests/tool-ocaml/t110-subint.ml
index 3993dd329e..dcef962805 100644
--- a/testsuite/tests/tool-ocaml/t110-subint.ml
+++ b/testsuite/tests/tool-ocaml/t110-subint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t110-xorint.ml b/testsuite/tests/tool-ocaml/t110-xorint.ml
index 2dd2a9b96c..71aaaff1f8 100644
--- a/testsuite/tests/tool-ocaml/t110-xorint.ml
+++ b/testsuite/tests/tool-ocaml/t110-xorint.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t120-getstringchar.ml b/testsuite/tests/tool-ocaml/t120-getstringchar.ml
index 271022c355..3e38b57d42 100644
--- a/testsuite/tests/tool-ocaml/t120-getstringchar.ml
+++ b/testsuite/tests/tool-ocaml/t120-getstringchar.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t121-setstringchar.ml b/testsuite/tests/tool-ocaml/t121-setstringchar.ml
index 6ea9899c13..40f8a92d63 100644
--- a/testsuite/tests/tool-ocaml/t121-setstringchar.ml
+++ b/testsuite/tests/tool-ocaml/t121-setstringchar.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t130-getvectitem.ml b/testsuite/tests/tool-ocaml/t130-getvectitem.ml
index f8af8f1714..fd04d3e530 100644
--- a/testsuite/tests/tool-ocaml/t130-getvectitem.ml
+++ b/testsuite/tests/tool-ocaml/t130-getvectitem.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t130-vectlength.ml b/testsuite/tests/tool-ocaml/t130-vectlength.ml
index ea56854426..eae6839121 100644
--- a/testsuite/tests/tool-ocaml/t130-vectlength.ml
+++ b/testsuite/tests/tool-ocaml/t130-vectlength.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t131-setvectitem.ml b/testsuite/tests/tool-ocaml/t131-setvectitem.ml
index abb238f3c4..8f7065ea97 100644
--- a/testsuite/tests/tool-ocaml/t131-setvectitem.ml
+++ b/testsuite/tests/tool-ocaml/t131-setvectitem.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t140-switch-1.ml b/testsuite/tests/tool-ocaml/t140-switch-1.ml
index 0928b06875..e932d4eb3c 100644
--- a/testsuite/tests/tool-ocaml/t140-switch-1.ml
+++ b/testsuite/tests/tool-ocaml/t140-switch-1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t140-switch-2.ml b/testsuite/tests/tool-ocaml/t140-switch-2.ml
index 3089ffbc0d..a7a81a9fe2 100644
--- a/testsuite/tests/tool-ocaml/t140-switch-2.ml
+++ b/testsuite/tests/tool-ocaml/t140-switch-2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t140-switch-3.ml b/testsuite/tests/tool-ocaml/t140-switch-3.ml
index ff15ead8a0..35e98bf7c3 100644
--- a/testsuite/tests/tool-ocaml/t140-switch-3.ml
+++ b/testsuite/tests/tool-ocaml/t140-switch-3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t140-switch-4.ml b/testsuite/tests/tool-ocaml/t140-switch-4.ml
index 61b7954dd0..4596100adf 100644
--- a/testsuite/tests/tool-ocaml/t140-switch-4.ml
+++ b/testsuite/tests/tool-ocaml/t140-switch-4.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t141-switch-5.ml b/testsuite/tests/tool-ocaml/t141-switch-5.ml
index 29d2cd5d91..7379a75a04 100644
--- a/testsuite/tests/tool-ocaml/t141-switch-5.ml
+++ b/testsuite/tests/tool-ocaml/t141-switch-5.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t141-switch-6.ml b/testsuite/tests/tool-ocaml/t141-switch-6.ml
index 34a87740b3..0f5ec6a45e 100644
--- a/testsuite/tests/tool-ocaml/t141-switch-6.ml
+++ b/testsuite/tests/tool-ocaml/t141-switch-6.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t141-switch-7.ml b/testsuite/tests/tool-ocaml/t141-switch-7.ml
index 137080e0c0..2d4eb469b0 100644
--- a/testsuite/tests/tool-ocaml/t141-switch-7.ml
+++ b/testsuite/tests/tool-ocaml/t141-switch-7.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t142-switch-8.ml b/testsuite/tests/tool-ocaml/t142-switch-8.ml
index 5d806419cc..78bec9f0f0 100644
--- a/testsuite/tests/tool-ocaml/t142-switch-8.ml
+++ b/testsuite/tests/tool-ocaml/t142-switch-8.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t142-switch-9.ml b/testsuite/tests/tool-ocaml/t142-switch-9.ml
index 8de4de43d2..31b3fe05ad 100644
--- a/testsuite/tests/tool-ocaml/t142-switch-9.ml
+++ b/testsuite/tests/tool-ocaml/t142-switch-9.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t142-switch-A.ml b/testsuite/tests/tool-ocaml/t142-switch-A.ml
index 09bfdedfbf..c356d29626 100644
--- a/testsuite/tests/tool-ocaml/t142-switch-A.ml
+++ b/testsuite/tests/tool-ocaml/t142-switch-A.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t150-push-1.ml b/testsuite/tests/tool-ocaml/t150-push-1.ml
index d13723b409..b34e13f3cd 100644
--- a/testsuite/tests/tool-ocaml/t150-push-1.ml
+++ b/testsuite/tests/tool-ocaml/t150-push-1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t150-push-2.ml b/testsuite/tests/tool-ocaml/t150-push-2.ml
index ce9cc2877b..d2c9bc532e 100644
--- a/testsuite/tests/tool-ocaml/t150-push-2.ml
+++ b/testsuite/tests/tool-ocaml/t150-push-2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t160-closure.ml b/testsuite/tests/tool-ocaml/t160-closure.ml
index f26a4c9f79..9ad6c07a5c 100644
--- a/testsuite/tests/tool-ocaml/t160-closure.ml
+++ b/testsuite/tests/tool-ocaml/t160-closure.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t161-apply1.ml b/testsuite/tests/tool-ocaml/t161-apply1.ml
index beccf312fc..5bb6cddc6d 100644
--- a/testsuite/tests/tool-ocaml/t161-apply1.ml
+++ b/testsuite/tests/tool-ocaml/t161-apply1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t162-return.ml b/testsuite/tests/tool-ocaml/t162-return.ml
index 664c54b21c..59c549c807 100644
--- a/testsuite/tests/tool-ocaml/t162-return.ml
+++ b/testsuite/tests/tool-ocaml/t162-return.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t163.ml b/testsuite/tests/tool-ocaml/t163.ml
index 41380ca26b..ea0c181da6 100644
--- a/testsuite/tests/tool-ocaml/t163.ml
+++ b/testsuite/tests/tool-ocaml/t163.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t164-apply2.ml b/testsuite/tests/tool-ocaml/t164-apply2.ml
index af928e714d..a5f5e7f98c 100644
--- a/testsuite/tests/tool-ocaml/t164-apply2.ml
+++ b/testsuite/tests/tool-ocaml/t164-apply2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t164-apply3.ml b/testsuite/tests/tool-ocaml/t164-apply3.ml
index 2c4f1f6e5e..fdc92df92e 100644
--- a/testsuite/tests/tool-ocaml/t164-apply3.ml
+++ b/testsuite/tests/tool-ocaml/t164-apply3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t165-apply.ml b/testsuite/tests/tool-ocaml/t165-apply.ml
index c06caf0f9b..ab51c87d52 100644
--- a/testsuite/tests/tool-ocaml/t165-apply.ml
+++ b/testsuite/tests/tool-ocaml/t165-apply.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t170-envacc2.ml b/testsuite/tests/tool-ocaml/t170-envacc2.ml
index 3484ca54fd..19c183fb85 100644
--- a/testsuite/tests/tool-ocaml/t170-envacc2.ml
+++ b/testsuite/tests/tool-ocaml/t170-envacc2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t170-envacc3.ml b/testsuite/tests/tool-ocaml/t170-envacc3.ml
index 583fd00fdb..9b494a0a05 100644
--- a/testsuite/tests/tool-ocaml/t170-envacc3.ml
+++ b/testsuite/tests/tool-ocaml/t170-envacc3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t170-envacc4.ml b/testsuite/tests/tool-ocaml/t170-envacc4.ml
index 70df1ac98f..6a44794f41 100644
--- a/testsuite/tests/tool-ocaml/t170-envacc4.ml
+++ b/testsuite/tests/tool-ocaml/t170-envacc4.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t171-envacc.ml b/testsuite/tests/tool-ocaml/t171-envacc.ml
index 98bb61f5d1..f91f4c748a 100644
--- a/testsuite/tests/tool-ocaml/t171-envacc.ml
+++ b/testsuite/tests/tool-ocaml/t171-envacc.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t172-pushenvacc1.ml b/testsuite/tests/tool-ocaml/t172-pushenvacc1.ml
index 7ad3287eb6..55d2600163 100644
--- a/testsuite/tests/tool-ocaml/t172-pushenvacc1.ml
+++ b/testsuite/tests/tool-ocaml/t172-pushenvacc1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t172-pushenvacc2.ml b/testsuite/tests/tool-ocaml/t172-pushenvacc2.ml
index 70e2311579..ae034cc1ec 100644
--- a/testsuite/tests/tool-ocaml/t172-pushenvacc2.ml
+++ b/testsuite/tests/tool-ocaml/t172-pushenvacc2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t172-pushenvacc3.ml b/testsuite/tests/tool-ocaml/t172-pushenvacc3.ml
index 170dc2afbc..4203cc1c41 100644
--- a/testsuite/tests/tool-ocaml/t172-pushenvacc3.ml
+++ b/testsuite/tests/tool-ocaml/t172-pushenvacc3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t172-pushenvacc4.ml b/testsuite/tests/tool-ocaml/t172-pushenvacc4.ml
index 16967b6f6f..061abe3d18 100644
--- a/testsuite/tests/tool-ocaml/t172-pushenvacc4.ml
+++ b/testsuite/tests/tool-ocaml/t172-pushenvacc4.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t173-pushenvacc.ml b/testsuite/tests/tool-ocaml/t173-pushenvacc.ml
index 3a2c19ddb0..2a43f1c68f 100644
--- a/testsuite/tests/tool-ocaml/t173-pushenvacc.ml
+++ b/testsuite/tests/tool-ocaml/t173-pushenvacc.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t180-appterm1.ml b/testsuite/tests/tool-ocaml/t180-appterm1.ml
index 42e6c32386..56853e159e 100644
--- a/testsuite/tests/tool-ocaml/t180-appterm1.ml
+++ b/testsuite/tests/tool-ocaml/t180-appterm1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t180-appterm2.ml b/testsuite/tests/tool-ocaml/t180-appterm2.ml
index 0afccadf1f..2f68cd13ac 100644
--- a/testsuite/tests/tool-ocaml/t180-appterm2.ml
+++ b/testsuite/tests/tool-ocaml/t180-appterm2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t180-appterm3.ml b/testsuite/tests/tool-ocaml/t180-appterm3.ml
index d0ed1e6743..788c0adab8 100644
--- a/testsuite/tests/tool-ocaml/t180-appterm3.ml
+++ b/testsuite/tests/tool-ocaml/t180-appterm3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t181-appterm.ml b/testsuite/tests/tool-ocaml/t181-appterm.ml
index 4a7778e532..f001d871b6 100644
--- a/testsuite/tests/tool-ocaml/t181-appterm.ml
+++ b/testsuite/tests/tool-ocaml/t181-appterm.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t190-makefloatblock-1.ml b/testsuite/tests/tool-ocaml/t190-makefloatblock-1.ml
index 0d3c6d1374..22d52d58ac 100644
--- a/testsuite/tests/tool-ocaml/t190-makefloatblock-1.ml
+++ b/testsuite/tests/tool-ocaml/t190-makefloatblock-1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t190-makefloatblock-2.ml b/testsuite/tests/tool-ocaml/t190-makefloatblock-2.ml
index 869b6de9e8..5b3ffd7c80 100644
--- a/testsuite/tests/tool-ocaml/t190-makefloatblock-2.ml
+++ b/testsuite/tests/tool-ocaml/t190-makefloatblock-2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t190-makefloatblock-3.ml b/testsuite/tests/tool-ocaml/t190-makefloatblock-3.ml
index a966a2f21c..63d8e6bf31 100644
--- a/testsuite/tests/tool-ocaml/t190-makefloatblock-3.ml
+++ b/testsuite/tests/tool-ocaml/t190-makefloatblock-3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t191-vectlength.ml b/testsuite/tests/tool-ocaml/t191-vectlength.ml
index ef7a93f5c2..b154108352 100644
--- a/testsuite/tests/tool-ocaml/t191-vectlength.ml
+++ b/testsuite/tests/tool-ocaml/t191-vectlength.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t192-getfloatfield-1.ml b/testsuite/tests/tool-ocaml/t192-getfloatfield-1.ml
index 74e1f7a6ae..bd4af309e8 100644
--- a/testsuite/tests/tool-ocaml/t192-getfloatfield-1.ml
+++ b/testsuite/tests/tool-ocaml/t192-getfloatfield-1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t192-getfloatfield-2.ml b/testsuite/tests/tool-ocaml/t192-getfloatfield-2.ml
index fc224244de..c5b59ebad4 100644
--- a/testsuite/tests/tool-ocaml/t192-getfloatfield-2.ml
+++ b/testsuite/tests/tool-ocaml/t192-getfloatfield-2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t193-setfloatfield-1.ml b/testsuite/tests/tool-ocaml/t193-setfloatfield-1.ml
index 708c3bc42c..12e7554882 100644
--- a/testsuite/tests/tool-ocaml/t193-setfloatfield-1.ml
+++ b/testsuite/tests/tool-ocaml/t193-setfloatfield-1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t193-setfloatfield-2.ml b/testsuite/tests/tool-ocaml/t193-setfloatfield-2.ml
index 80d010f6ee..d5cc07194a 100644
--- a/testsuite/tests/tool-ocaml/t193-setfloatfield-2.ml
+++ b/testsuite/tests/tool-ocaml/t193-setfloatfield-2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t200-getfield0.ml b/testsuite/tests/tool-ocaml/t200-getfield0.ml
index fa768984b7..4be33c0f4a 100644
--- a/testsuite/tests/tool-ocaml/t200-getfield0.ml
+++ b/testsuite/tests/tool-ocaml/t200-getfield0.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t200-getfield1.ml b/testsuite/tests/tool-ocaml/t200-getfield1.ml
index c394ab2c2f..de07981dc3 100644
--- a/testsuite/tests/tool-ocaml/t200-getfield1.ml
+++ b/testsuite/tests/tool-ocaml/t200-getfield1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t200-getfield2.ml b/testsuite/tests/tool-ocaml/t200-getfield2.ml
index 954f86f0d5..d8930fc75c 100644
--- a/testsuite/tests/tool-ocaml/t200-getfield2.ml
+++ b/testsuite/tests/tool-ocaml/t200-getfield2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t200-getfield3.ml b/testsuite/tests/tool-ocaml/t200-getfield3.ml
index 3381468e0d..8b2189ca05 100644
--- a/testsuite/tests/tool-ocaml/t200-getfield3.ml
+++ b/testsuite/tests/tool-ocaml/t200-getfield3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t201-getfield.ml b/testsuite/tests/tool-ocaml/t201-getfield.ml
index f76fe0057c..253262f201 100644
--- a/testsuite/tests/tool-ocaml/t201-getfield.ml
+++ b/testsuite/tests/tool-ocaml/t201-getfield.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t210-setfield0.ml b/testsuite/tests/tool-ocaml/t210-setfield0.ml
index 40803c4f20..e1891fa82c 100644
--- a/testsuite/tests/tool-ocaml/t210-setfield0.ml
+++ b/testsuite/tests/tool-ocaml/t210-setfield0.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t210-setfield1.ml b/testsuite/tests/tool-ocaml/t210-setfield1.ml
index ff65da7a2b..ffbdc0f202 100644
--- a/testsuite/tests/tool-ocaml/t210-setfield1.ml
+++ b/testsuite/tests/tool-ocaml/t210-setfield1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t210-setfield2.ml b/testsuite/tests/tool-ocaml/t210-setfield2.ml
index 7a46e87aa6..b7d8cd50b4 100644
--- a/testsuite/tests/tool-ocaml/t210-setfield2.ml
+++ b/testsuite/tests/tool-ocaml/t210-setfield2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t210-setfield3.ml b/testsuite/tests/tool-ocaml/t210-setfield3.ml
index 20394fbbdb..d921a3043f 100644
--- a/testsuite/tests/tool-ocaml/t210-setfield3.ml
+++ b/testsuite/tests/tool-ocaml/t210-setfield3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t211-setfield.ml b/testsuite/tests/tool-ocaml/t211-setfield.ml
index 21730fae0b..f935b7e555 100644
--- a/testsuite/tests/tool-ocaml/t211-setfield.ml
+++ b/testsuite/tests/tool-ocaml/t211-setfield.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t220-assign.ml b/testsuite/tests/tool-ocaml/t220-assign.ml
index 0044f89e30..26c6287cb2 100644
--- a/testsuite/tests/tool-ocaml/t220-assign.ml
+++ b/testsuite/tests/tool-ocaml/t220-assign.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t230-check_signals.ml b/testsuite/tests/tool-ocaml/t230-check_signals.ml
index d027d690be..3df0a96759 100644
--- a/testsuite/tests/tool-ocaml/t230-check_signals.ml
+++ b/testsuite/tests/tool-ocaml/t230-check_signals.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t240-c_call1.ml b/testsuite/tests/tool-ocaml/t240-c_call1.ml
index 89758f5014..a5feaebb92 100644
--- a/testsuite/tests/tool-ocaml/t240-c_call1.ml
+++ b/testsuite/tests/tool-ocaml/t240-c_call1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t240-c_call2.ml b/testsuite/tests/tool-ocaml/t240-c_call2.ml
index 35d3916e82..963c42eaaf 100644
--- a/testsuite/tests/tool-ocaml/t240-c_call2.ml
+++ b/testsuite/tests/tool-ocaml/t240-c_call2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t240-c_call3.ml b/testsuite/tests/tool-ocaml/t240-c_call3.ml
index f98ed86f2e..994b00f09c 100644
--- a/testsuite/tests/tool-ocaml/t240-c_call3.ml
+++ b/testsuite/tests/tool-ocaml/t240-c_call3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t240-c_call4.ml b/testsuite/tests/tool-ocaml/t240-c_call4.ml
index e5a47342a2..24fa8a4ee7 100644
--- a/testsuite/tests/tool-ocaml/t240-c_call4.ml
+++ b/testsuite/tests/tool-ocaml/t240-c_call4.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t240-c_call5.ml b/testsuite/tests/tool-ocaml/t240-c_call5.ml
index 14a5954a9f..e55a454edf 100644
--- a/testsuite/tests/tool-ocaml/t240-c_call5.ml
+++ b/testsuite/tests/tool-ocaml/t240-c_call5.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t250-closurerec-1.ml b/testsuite/tests/tool-ocaml/t250-closurerec-1.ml
index d8e3169f6d..3285c5c96a 100644
--- a/testsuite/tests/tool-ocaml/t250-closurerec-1.ml
+++ b/testsuite/tests/tool-ocaml/t250-closurerec-1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t250-closurerec-2.ml b/testsuite/tests/tool-ocaml/t250-closurerec-2.ml
index 4ddfd208eb..cd1e1f89dd 100644
--- a/testsuite/tests/tool-ocaml/t250-closurerec-2.ml
+++ b/testsuite/tests/tool-ocaml/t250-closurerec-2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t251-pushoffsetclosure0.ml b/testsuite/tests/tool-ocaml/t251-pushoffsetclosure0.ml
index aa29928be4..3df568aab5 100644
--- a/testsuite/tests/tool-ocaml/t251-pushoffsetclosure0.ml
+++ b/testsuite/tests/tool-ocaml/t251-pushoffsetclosure0.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t251-pushoffsetclosure2.ml b/testsuite/tests/tool-ocaml/t251-pushoffsetclosure2.ml
index c84eea3774..9304ee1668 100644
--- a/testsuite/tests/tool-ocaml/t251-pushoffsetclosure2.ml
+++ b/testsuite/tests/tool-ocaml/t251-pushoffsetclosure2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t251-pushoffsetclosurem2.ml b/testsuite/tests/tool-ocaml/t251-pushoffsetclosurem2.ml
index bc19d6fb45..bb70ea2811 100644
--- a/testsuite/tests/tool-ocaml/t251-pushoffsetclosurem2.ml
+++ b/testsuite/tests/tool-ocaml/t251-pushoffsetclosurem2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t252-pushoffsetclosure.ml b/testsuite/tests/tool-ocaml/t252-pushoffsetclosure.ml
index dee93f84dc..1c949dde9f 100644
--- a/testsuite/tests/tool-ocaml/t252-pushoffsetclosure.ml
+++ b/testsuite/tests/tool-ocaml/t252-pushoffsetclosure.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t253-offsetclosure0.ml b/testsuite/tests/tool-ocaml/t253-offsetclosure0.ml
index 092f755a75..14f7bb92ae 100644
--- a/testsuite/tests/tool-ocaml/t253-offsetclosure0.ml
+++ b/testsuite/tests/tool-ocaml/t253-offsetclosure0.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t253-offsetclosure2.ml b/testsuite/tests/tool-ocaml/t253-offsetclosure2.ml
index 977574ded2..46769674fe 100644
--- a/testsuite/tests/tool-ocaml/t253-offsetclosure2.ml
+++ b/testsuite/tests/tool-ocaml/t253-offsetclosure2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t253-offsetclosurem2.ml b/testsuite/tests/tool-ocaml/t253-offsetclosurem2.ml
index 69b2f13915..16ada804db 100644
--- a/testsuite/tests/tool-ocaml/t253-offsetclosurem2.ml
+++ b/testsuite/tests/tool-ocaml/t253-offsetclosurem2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t254-offsetclosure.ml b/testsuite/tests/tool-ocaml/t254-offsetclosure.ml
index 1bf10ceef5..a40f94152d 100644
--- a/testsuite/tests/tool-ocaml/t254-offsetclosure.ml
+++ b/testsuite/tests/tool-ocaml/t254-offsetclosure.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t260-offsetref.ml b/testsuite/tests/tool-ocaml/t260-offsetref.ml
index 2884f468b9..4dd2d0f971 100644
--- a/testsuite/tests/tool-ocaml/t260-offsetref.ml
+++ b/testsuite/tests/tool-ocaml/t260-offsetref.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t270-push_retaddr.ml b/testsuite/tests/tool-ocaml/t270-push_retaddr.ml
index 137d668c32..8a56844657 100644
--- a/testsuite/tests/tool-ocaml/t270-push_retaddr.ml
+++ b/testsuite/tests/tool-ocaml/t270-push_retaddr.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t300-getmethod.ml b/testsuite/tests/tool-ocaml/t300-getmethod.ml
index c860060479..da4c46ea12 100644
--- a/testsuite/tests/tool-ocaml/t300-getmethod.ml
+++ b/testsuite/tests/tool-ocaml/t300-getmethod.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t301-object.ml b/testsuite/tests/tool-ocaml/t301-object.ml
index 1d035a4a0b..dc170ae97c 100644
--- a/testsuite/tests/tool-ocaml/t301-object.ml
+++ b/testsuite/tests/tool-ocaml/t301-object.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
(**** file testinterp/t301-object.ml
diff --git a/testsuite/tests/tool-ocaml/t310-alloc-1.ml b/testsuite/tests/tool-ocaml/t310-alloc-1.ml
index 7021eda5a2..5f57c1e206 100644
--- a/testsuite/tests/tool-ocaml/t310-alloc-1.ml
+++ b/testsuite/tests/tool-ocaml/t310-alloc-1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t310-alloc-2.ml b/testsuite/tests/tool-ocaml/t310-alloc-2.ml
index 4118a737bd..a2f31d4a08 100644
--- a/testsuite/tests/tool-ocaml/t310-alloc-2.ml
+++ b/testsuite/tests/tool-ocaml/t310-alloc-2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t320-gc-1.ml b/testsuite/tests/tool-ocaml/t320-gc-1.ml
index be95ac9e17..4c8f4bc94e 100644
--- a/testsuite/tests/tool-ocaml/t320-gc-1.ml
+++ b/testsuite/tests/tool-ocaml/t320-gc-1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t320-gc-2.ml b/testsuite/tests/tool-ocaml/t320-gc-2.ml
index 54203e9e72..39678f8f7b 100644
--- a/testsuite/tests/tool-ocaml/t320-gc-2.ml
+++ b/testsuite/tests/tool-ocaml/t320-gc-2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t320-gc-3.ml b/testsuite/tests/tool-ocaml/t320-gc-3.ml
index c9b4e49b3e..e3653c29c8 100644
--- a/testsuite/tests/tool-ocaml/t320-gc-3.ml
+++ b/testsuite/tests/tool-ocaml/t320-gc-3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t330-compact-1.ml b/testsuite/tests/tool-ocaml/t330-compact-1.ml
index fb58c1f859..a0a8838104 100644
--- a/testsuite/tests/tool-ocaml/t330-compact-1.ml
+++ b/testsuite/tests/tool-ocaml/t330-compact-1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t330-compact-2.ml b/testsuite/tests/tool-ocaml/t330-compact-2.ml
index d466b1a246..9ef3a2acba 100644
--- a/testsuite/tests/tool-ocaml/t330-compact-2.ml
+++ b/testsuite/tests/tool-ocaml/t330-compact-2.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t330-compact-3.ml b/testsuite/tests/tool-ocaml/t330-compact-3.ml
index 490b686ce6..95dfc4c18e 100644
--- a/testsuite/tests/tool-ocaml/t330-compact-3.ml
+++ b/testsuite/tests/tool-ocaml/t330-compact-3.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t330-compact-4.ml b/testsuite/tests/tool-ocaml/t330-compact-4.ml
index e27be14bb1..a0aabcc6fd 100644
--- a/testsuite/tests/tool-ocaml/t330-compact-4.ml
+++ b/testsuite/tests/tool-ocaml/t330-compact-4.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t340-weak.ml b/testsuite/tests/tool-ocaml/t340-weak.ml
index 6c3d26e2f3..596278d393 100644
--- a/testsuite/tests/tool-ocaml/t340-weak.ml
+++ b/testsuite/tests/tool-ocaml/t340-weak.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t350-heapcheck.ml b/testsuite/tests/tool-ocaml/t350-heapcheck.ml
index bf3d137aaa..3255cf9b84 100644
--- a/testsuite/tests/tool-ocaml/t350-heapcheck.ml
+++ b/testsuite/tests/tool-ocaml/t350-heapcheck.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t360-stacks-1.ml b/testsuite/tests/tool-ocaml/t360-stacks-1.ml
index b952c18a8f..48c116c353 100644
--- a/testsuite/tests/tool-ocaml/t360-stacks-1.ml
+++ b/testsuite/tests/tool-ocaml/t360-stacks-1.ml
@@ -1,9 +1,9 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;
diff --git a/testsuite/tests/tool-ocaml/t360-stacks-2.ml b/testsuite/tests/tool-ocaml/t360-stacks-2.ml
index ee73fa3dd6..1f632d7f7d 100644
--- a/testsuite/tests/tool-ocaml/t360-stacks-2.ml
+++ b/testsuite/tests/tool-ocaml/t360-stacks-2.ml
@@ -1,10 +1,10 @@
(* TEST
-include tool-ocaml-lib
-flags = "-w -a"
-ocaml_script_as_argument = "true"
-ocamlrunparam = "l=1000000"
-* setup-ocaml-build-env
-** ocaml
+ include tool-ocaml-lib;
+ flags = "-w -a";
+ ocaml_script_as_argument = "true";
+ ocamlrunparam = "l=1000000";
+ setup-ocaml-build-env;
+ ocaml;
*)
open Lib;;