Move more tests to just flambda2

Author: ncik-roberts

ocaml/testsuite/tests/mixed-blocks/generate_mixed_blocks_code.ml

@@ -290,8 +290,8 @@ let main n ~bytecode =
   let per_type f = List.iter named_blocks ~f in
   line {|(* TEST
   flags = "-extension layouts_alpha"
-    * %s
-*)|} (if bytecode then "bytecode" else "native");
+  %s
+*)|} (if bytecode then "* bytecode" else "* flambda2\n  ** native");
   line "(** This is code generated by [generate_mixed_blocks_code.ml]. *)";
   line "";
   line "(* Helper functions for manipulating the fields of a mixed record *)";

ocaml/testsuite/tests/mixed-blocks/generated_byte_test.ml

@@ -1,6 +1,6 @@
 (* TEST
   flags = "-extension layouts_alpha"
-    * bytecode
+  * bytecode
 *)
 (** This is code generated by [generate_mixed_blocks_code.ml]. *)
 

ocaml/testsuite/tests/mixed-blocks/generated_native_test.ml

@@ -1,6 +1,7 @@
 (* TEST
   flags = "-extension layouts_alpha"
-    * native
+  * flambda2
+  ** native
 *)
 (** This is code generated by [generate_mixed_blocks_code.ml]. *)
 

ocaml/testsuite/tests/mixed-blocks/hash.ml

@@ -3,15 +3,16 @@
  program = "${test_build_directory}/hash.exe"
 all_modules = "hash.ml"
 
- * setup-ocamlc.opt-build-env
- ** ocamlc.opt
- *** run
- **** check-program-output
+ * flambda2
+ ** setup-ocamlc.opt-build-env
+ *** ocamlc.opt
+ **** run
+ ***** check-program-output
    reference = "${test_source_directory}/hash.byte.reference"
- * setup-ocamlopt.opt-build-env
- ** ocamlopt.opt
- *** run
- **** check-program-output
+ ** setup-ocamlopt.opt-build-env
+ *** ocamlopt.opt
+ **** run
+ ***** check-program-output
    reference = "${test_source_directory}/hash.native.reference"
 *)
 

ocaml/testsuite/tests/mixed-blocks/recursive_mixed_blocks.ml

@@ -1,5 +1,9 @@
 (* TEST
    flags = "-extension layouts_alpha"
+
+   * flambda2
+   ** native
+   ** bytecode
  *)
 
 type t = { t : t; flt : float# }