flambda-backend: Import testsuite changes to 9e75e07 from 5.2-runtime-wip-main

Author: mshinwell

testsuite/Makefile

@@ -141,15 +141,7 @@ default:
 	@echo "    ... DIR=d                  ... the tests located in the directory d"
 	@echo "    ... LIST=f                 ... the tests listed in the file f (one \
 	per line)"
-<<<<<<< HEAD
-	@echo "  promote-failed  promote all the tests that failed in the previous run"
-	@echo "  lib                        build library modules"
-	@echo "  tools                      build test tools"
-||||||| 121bedcfd2
-	@echo "  lib                        build library modules"
-	@echo "  tools                      build test tools"
-=======
->>>>>>> 5.2.0
+	@echo "  promote-failed             promote all the tests that failed in the previous run"
 	@echo "  clean                      delete generated files"
 	@echo "  report                     print the report for the last execution"
 	@echo

testsuite/lib/dune

@@ -0,0 +1,12 @@
+(library
+ (wrapped false)
+ (modes byte native)
+ (name lib)
+ (modules lib))
+
+(library
+ (wrapped false)
+ (modes byte native)
+ (name testing)
+ (flags -linkall)
+ (modules testing))

testsuite/lib/lib.mli

@@ -14,6 +14,7 @@
 (**************************************************************************)
 
 external raise : exn -> 'a = "%raise"
+external with_async_exns : (unit -> 'a) -> 'a = "caml_with_async_exns"
 
 external not : bool -> bool = "%boolnot"
 

testsuite/tests/afl-instrumentation/afl-fuzz-test.ml

@@ -1,21 +1,6 @@
-<<<<<<< HEAD
-(* TEST
-   reason = "Broken, ask mshinwell if you want to try to fix it";
-   skip;
-||||||| 121bedcfd2
-(* TEST (* Just a test-driver *)
-   * native-compiler
-   ** script
-       script = "sh ${test_source_directory}/has-afl-fuzz.sh"
-       readonly_files = "readline.ml"
-   *** setup-ocamlopt.byte-build-env
-   **** ocamlopt.byte
-         program = "${test_build_directory}/readline"
-         flags = "-afl-instrument"
-         all_modules = "readline.ml"
-   ***** run
-=======
 (* TEST
+ reason = "Broken, ask mshinwell if you want to try to fix it";
+ skip;
  native-compiler;
  script = "sh ${test_source_directory}/has-afl-fuzz.sh";
  readonly_files = "readline.ml";
@@ -26,25 +11,6 @@
  all_modules = "readline.ml";
  ocamlopt.byte;
  run;
->>>>>>> 5.2.0
 *)
-<<<<<<< HEAD
-(* TEST
- native-compiler;
- script = "sh ${test_source_directory}/has-afl-fuzz.sh";
- readonly_files = "readline.ml";
- script;
- setup-ocamlopt.byte-build-env;
- program = "${test_build_directory}/readline";
- flags = "-afl-instrument";
- all_modules = "readline.ml";
- ocamlopt.byte;
- run;
-*)
-
-(* No code here, this file is a pure test script. *)
-||||||| 121bedcfd2
-=======
 
 (* No code here, this file is a pure test script. *)
->>>>>>> 5.2.0

testsuite/tests/arch-power/exn_raise.ml

@@ -1,22 +1,8 @@
 (* TEST
-<<<<<<< HEAD
  arch_power;
  native;
- ocamlopt_flags = "-flarge-toc";
  ocamlopt.byte;
  run;
-||||||| 121bedcfd2
-  * arch_power
-  ** native
-  *** ocamlopt.byte
-  ocamlopt_flags = "-flarge-toc"
-  **** run
-=======
- arch_power;
- native;
- ocamlopt.byte;
- run;
->>>>>>> 5.2.0
 *)
 
 (* GPR#8506

testsuite/tests/asmcomp/poll_attr_both.ml

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 (* TEST_BELOW
 (* Blank lines added here to preserve locations. *)
 
@@ -9,23 +8,6 @@
 
 
 
-||||||| 121bedcfd2
-(* TEST
-  * setup-ocamlopt.byte-build-env
-  ** ocamlopt.byte
-ocamlopt_byte_exit_status = "2"
-  *** check-ocamlopt.byte-output
-=======
-(* TEST_BELOW
-(* Blank lines added here to preserve locations. *)
-
-
-
-
-
-
-
->>>>>>> 5.2.0
 
 *)
 
@@ -38,7 +20,6 @@ let[@poll error] c x =
         ignore(Sys.opaque_identity(42))
       done;
       x2 + !y
-<<<<<<< HEAD
 
 (* TEST
  poll-insertion;
@@ -54,20 +35,3 @@ let[@poll error] c x =
    check-ocamlopt.opt-output;
  }
 *)
-||||||| 121bedcfd2
-=======
-
-(* TEST
- {
-   setup-ocamlopt.byte-build-env;
-   ocamlopt_byte_exit_status = "2";
-   ocamlopt.byte;
-   check-ocamlopt.byte-output;
- }{
-   setup-ocamlopt.opt-build-env;
-   ocamlopt_opt_exit_status = "2";
-   ocamlopt.opt;
-   check-ocamlopt.opt-output;
- }
-*)
->>>>>>> 5.2.0

testsuite/tests/asmcomp/poll_attr_inserted.ml

@@ -1,5 +1,4 @@
 (* TEST
-<<<<<<< HEAD
  poll-insertion;
  {
    setup-ocamlopt.byte-build-env;
@@ -12,29 +11,6 @@
    ocamlopt.opt;
    check-ocamlopt.opt-output;
  }
-||||||| 121bedcfd2
-  * setup-ocamlopt.byte-build-env
-  ** ocamlopt.byte
-ocamlopt_byte_exit_status = "2"
-  *** check-ocamlopt.byte-output
-
-  * setup-ocamlopt.opt-build-env
-  ** ocamlopt.opt
-ocamlopt_opt_exit_status = "2"
-  *** check-ocamlopt.opt-output
-=======
- {
-   setup-ocamlopt.byte-build-env;
-   ocamlopt_byte_exit_status = "2";
-   ocamlopt.byte;
-   check-ocamlopt.byte-output;
- }{
-   setup-ocamlopt.opt-build-env;
-   ocamlopt_opt_exit_status = "2";
-   ocamlopt.opt;
-   check-ocamlopt.opt-output;
- }
->>>>>>> 5.2.0
 *)
 
 let[@poll error] c x =

testsuite/tests/asmcomp/poll_attr_prologue.ml

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 (* TEST_BELOW
 (* Blank lines added here to preserve locations. *)
 
@@ -9,31 +8,13 @@
 
 
 
-||||||| 121bedcfd2
-(* TEST
-  * setup-ocamlopt.byte-build-env
-  ** ocamlopt.byte
-ocamlopt_byte_exit_status = "2"
-  *** check-ocamlopt.byte-output
-=======
-(* TEST_BELOW
-(* Blank lines added here to preserve locations. *)
-
-
-
-
-
-
-
->>>>>>> 5.2.0
 
 *)
 
 let[@poll error] rec c x l =
   match l with
   | [] -> 0
   | _ :: tl -> (c[@tailcall]) (x+1) tl
-<<<<<<< HEAD
 
 (* TEST
  poll-insertion;
@@ -49,20 +30,3 @@ let[@poll error] rec c x l =
    check-ocamlopt.opt-output;
  }
 *)
-||||||| 121bedcfd2
-=======
-
-(* TEST
- {
-   setup-ocamlopt.byte-build-env;
-   ocamlopt_byte_exit_status = "2";
-   ocamlopt.byte;
-   check-ocamlopt.byte-output;
- }{
-   setup-ocamlopt.opt-build-env;
-   ocamlopt_opt_exit_status = "2";
-   ocamlopt.opt;
-   check-ocamlopt.opt-output;
- }
-*)
->>>>>>> 5.2.0

testsuite/tests/asmcomp/poll_attr_user.ml

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 (* TEST_BELOW
 (* Blank lines added here to preserve locations. *)
 
@@ -9,23 +8,6 @@
 
 
 
-||||||| 121bedcfd2
-(* TEST
-  * setup-ocamlopt.byte-build-env
-  ** ocamlopt.byte
-ocamlopt_byte_exit_status = "2"
-  *** check-ocamlopt.byte-output
-=======
-(* TEST_BELOW
-(* Blank lines added here to preserve locations. *)
-
-
-
-
-
-
-
->>>>>>> 5.2.0
 
 *)
 
@@ -38,7 +20,6 @@ let[@poll error] c x =
         ignore(Sys.opaque_identity(ref 42))
       done;
       x2 + !y
-<<<<<<< HEAD
 
 (* TEST
  poll-insertion;
@@ -54,20 +35,3 @@ let[@poll error] c x =
    check-ocamlopt.opt-output;
  }
 *)
-||||||| 121bedcfd2
-=======
-
-(* TEST
- {
-   setup-ocamlopt.byte-build-env;
-   ocamlopt_byte_exit_status = "2";
-   ocamlopt.byte;
-   check-ocamlopt.byte-output;
- }{
-   setup-ocamlopt.opt-build-env;
-   ocamlopt_opt_exit_status = "2";
-   ocamlopt.opt;
-   check-ocamlopt.opt-output;
- }
-*)
->>>>>>> 5.2.0

testsuite/tests/asmcomp/polling_insertion.ml

@@ -1,21 +1,9 @@
 (* TEST
-<<<<<<< HEAD
  modules = "polling.c";
  compare_programs = "false";
  poll-insertion;
  arch64;
  native;
-||||||| 121bedcfd2
-   modules = "polling.c"
-   compare_programs = "false"
-   * arch64
-   ** native
-=======
- modules = "polling.c";
- compare_programs = "false";
- arch64;
- native;
->>>>>>> 5.2.0
 *)
 
 (* This set of tests examine poll insertion behaviour. We do this by requesting