Merge branch 'trunk' into nick-get-copy

14 files changed, 99 insertions, 64 deletions

diff --git a/testsuite/tests/callback/callback_effects_gc.ml b/testsuite/tests/callback/callback_effects_gc.ml
index 191a23e0ff..50b5ac02f9 100644
--- a/testsuite/tests/callback/callback_effects_gc.ml
+++ b/testsuite/tests/callback/callback_effects_gc.ml
@@ -1,6 +1,6 @@
 (* TEST
-   ocamlrunparam += ",s=512"
-   * native
+ ocamlrunparam += ",s=512";
+ native;
 *)
 
 let count = ref 0
diff --git a/testsuite/tests/callback/minor_named.ml b/testsuite/tests/callback/minor_named.ml
index 9bc01b77d5..77b5e03118 100644
--- a/testsuite/tests/callback/minor_named.ml
+++ b/testsuite/tests/callback/minor_named.ml
@@ -1,9 +1,12 @@
 (* TEST
-   include unix
-   modules = "minor_named_.c"
-   * libunix
-   ** bytecode
-   ** native
+ include unix;
+ modules = "minor_named_.c";
+ libunix;
+ {
+   bytecode;
+ }{
+   native;
+ }
 *)
 
 (* Tests Callback.register and caml_named_value on a young object *)
diff --git a/testsuite/tests/callback/nested_fiber.ml b/testsuite/tests/callback/nested_fiber.ml
index 3786e455ef..2d144c09e7 100644
--- a/testsuite/tests/callback/nested_fiber.ml
+++ b/testsuite/tests/callback/nested_fiber.ml
@@ -1,9 +1,12 @@
 (* TEST
-   include unix
-   modules = "nested_fiber_.c"
-   * libunix
-   ** bytecode
-   ** native
+ include unix;
+ modules = "nested_fiber_.c";
+ libunix;
+ {
+   bytecode;
+ }{
+   native;
+ }
 *)
 
 external caml_to_c : (unit -> 'a) -> 'a = "caml_to_c"
diff --git a/testsuite/tests/callback/signals_alloc.ml b/testsuite/tests/callback/signals_alloc.ml
index 27ed2f7da6..ba3c9fbe3f 100644
--- a/testsuite/tests/callback/signals_alloc.ml
+++ b/testsuite/tests/callback/signals_alloc.ml
@@ -1,9 +1,12 @@
 (* TEST
-   include unix
-   modules = "callbackprim.c"
-   * libunix
-   ** bytecode
-   ** native
+ include unix;
+ modules = "callbackprim.c";
+ libunix;
+ {
+   bytecode;
+ }{
+   native;
+ }
 *)
 external raise_sigusr1 : unit -> unit = "raise_sigusr1"
 
diff --git a/testsuite/tests/callback/stack_overflow.ml b/testsuite/tests/callback/stack_overflow.ml
index 23691dcf6c..9b48df20e9 100644
--- a/testsuite/tests/callback/stack_overflow.ml
+++ b/testsuite/tests/callback/stack_overflow.ml
@@ -1,9 +1,12 @@
 (* TEST
-   include unix
-   modules = "stack_overflow_.c"
-   * libunix
-   ** bytecode
-   ** native
+ include unix;
+ modules = "stack_overflow_.c";
+ libunix;
+ {
+   bytecode;
+ }{
+   native;
+ }
 *)
 
 external caml_to_c : (unit -> 'a) -> 'a = "caml_to_c"
diff --git a/testsuite/tests/callback/test1.ml b/testsuite/tests/callback/test1.ml
index 7c45945a8b..e481d52aa9 100644
--- a/testsuite/tests/callback/test1.ml
+++ b/testsuite/tests/callback/test1.ml
@@ -1,9 +1,12 @@
 (* TEST
-   include unix
-   modules = "test1_.c"
-   * libunix
-   ** bytecode
-   ** native
+ include unix;
+ modules = "test1_.c";
+ libunix;
+ {
+   bytecode;
+ }{
+   native;
+ }
 *)
 
 (**************************************************************************)
diff --git a/testsuite/tests/callback/test2.ml b/testsuite/tests/callback/test2.ml
index 87314864f2..168745a2a5 100644
--- a/testsuite/tests/callback/test2.ml
+++ b/testsuite/tests/callback/test2.ml
@@ -1,9 +1,12 @@
 (* TEST
-   include unix
-   modules = "test2_.c"
-   * libunix
-   ** bytecode
-   ** native
+ include unix;
+ modules = "test2_.c";
+ libunix;
+ {
+   bytecode;
+ }{
+   native;
+ }
 *)
 
 (* Tests nested calls from C (main C) to OCaml (main OCaml) to C (caml_to_c) to
diff --git a/testsuite/tests/callback/test3.ml b/testsuite/tests/callback/test3.ml
index 6b4f64b739..ce40ae9141 100644
--- a/testsuite/tests/callback/test3.ml
+++ b/testsuite/tests/callback/test3.ml
@@ -1,9 +1,12 @@
 (* TEST
-   include unix
-   modules = "test3_.c"
-   * libunix
-   ** bytecode
-   ** native
+ include unix;
+ modules = "test3_.c";
+ libunix;
+ {
+   bytecode;
+ }{
+   native;
+ }
 *)
 
 (* Tests nested calls from C (main C) to OCaml (main OCaml) to C (caml_to_c) to
diff --git a/testsuite/tests/callback/test4.ml b/testsuite/tests/callback/test4.ml
index 3c42317d7e..5f51c45158 100644
--- a/testsuite/tests/callback/test4.ml
+++ b/testsuite/tests/callback/test4.ml
@@ -1,9 +1,12 @@
 (* TEST
-   include unix
-   modules = "test4_.c"
-   * libunix
-   ** bytecode
-   ** native
+ include unix;
+ modules = "test4_.c";
+ libunix;
+ {
+   bytecode;
+ }{
+   native;
+ }
 *)
 
 (* Tests nested calls from C (main C) to OCaml (main OCaml) to C (caml_to_c) to
diff --git a/testsuite/tests/callback/test5.ml b/testsuite/tests/callback/test5.ml
index 62fd8b9b0e..0249f93537 100644
--- a/testsuite/tests/callback/test5.ml
+++ b/testsuite/tests/callback/test5.ml
@@ -1,9 +1,12 @@
 (* TEST
-   include unix
-   modules = "test5_.c"
-   * libunix
-   ** bytecode
-   ** native
+ include unix;
+ modules = "test5_.c";
+ libunix;
+ {
+   bytecode;
+ }{
+   native;
+ }
 *)
 
 (* Tests nested calls from C (main C) to OCaml (main OCaml) to C (caml_to_c) to
diff --git a/testsuite/tests/callback/test6.ml b/testsuite/tests/callback/test6.ml
index e3ff477f5b..4ecdafdf98 100644
--- a/testsuite/tests/callback/test6.ml
+++ b/testsuite/tests/callback/test6.ml
@@ -1,9 +1,12 @@
 (* TEST
-   include unix
-   modules = "test6_.c"
-   * libunix
-   ** bytecode
-   ** native
+ include unix;
+ modules = "test6_.c";
+ libunix;
+ {
+   bytecode;
+ }{
+   native;
+ }
 *)
 
 (* Tests nested calls from C (main C) to OCaml (main OCaml) to C (caml_to_c) to
diff --git a/testsuite/tests/callback/test7.ml b/testsuite/tests/callback/test7.ml
index 8883a55f69..b607ec3cfb 100644
--- a/testsuite/tests/callback/test7.ml
+++ b/testsuite/tests/callback/test7.ml
@@ -1,9 +1,12 @@
 (* TEST
-   include unix
-   modules = "test7_.c"
-   * libunix
-   ** bytecode
-   ** native
+ include unix;
+ modules = "test7_.c";
+ libunix;
+ {
+   bytecode;
+ }{
+   native;
+ }
 *)
 
 (* Tests nested calls from C (main C) to OCaml (main OCaml) to C (caml_to_c) to
diff --git a/testsuite/tests/callback/test_finaliser_gc.ml b/testsuite/tests/callback/test_finaliser_gc.ml
index c9c51cabb6..97c98cf89a 100644
--- a/testsuite/tests/callback/test_finaliser_gc.ml
+++ b/testsuite/tests/callback/test_finaliser_gc.ml
@@ -1,5 +1,4 @@
-(* TEST
-*)
+(* TEST *)
 
 let z = ref (0, 1, 2, 3, 4, 5, 6, 7)
 let finaliser_pending = ref true
diff --git a/testsuite/tests/callback/test_signalhandler.ml b/testsuite/tests/callback/test_signalhandler.ml
index a2bbacee72..d94b17c036 100644
--- a/testsuite/tests/callback/test_signalhandler.ml
+++ b/testsuite/tests/callback/test_signalhandler.ml
@@ -1,9 +1,12 @@
 (* TEST
-   include unix
-   modules = "test_signalhandler_.c"
-   * libunix
-   ** bytecode
-   ** native
+ include unix;
+ modules = "test_signalhandler_.c";
+ libunix;
+ {
+   bytecode;
+ }{
+   native;
+ }
 *)
 
 (**************************************************************************)