From e73c1a296676dbb63574166e9ac31522e8dd8622 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Sun, 9 Jul 2023 22:07:44 -0400 Subject: [PATCH] tests: compat 4.x --- test/effect-based/dune | 2 ++ test/effect-based/t_fib1.ml | 4 ++++ test/effect-based/t_fib_fork_join.ml | 4 ++++ test/effect-based/t_fib_fork_join_all.ml | 4 ++++ test/effect-based/t_fork_join.ml | 4 ++++ test/effect-based/t_futs1.ml | 4 ++++ test/effect-based/t_many.ml | 4 ++++ test/effect-based/t_sort.ml | 4 ++++ 8 files changed, 30 insertions(+) diff --git a/test/effect-based/dune b/test/effect-based/dune index e1240926..eb040feb 100644 --- a/test/effect-based/dune +++ b/test/effect-based/dune @@ -2,6 +2,8 @@ (tests (names t_fib1 t_futs1 t_many t_fib_fork_join t_fib_fork_join_all t_sort t_fork_join) + (preprocess (action + (run %{project_root}/src/cpp/cpp.exe %{input-file}))) (enabled_if (>= %{ocaml_version} 5.0)) (libraries moonpool trace ;tracy-client.trace )) diff --git a/test/effect-based/t_fib1.ml b/test/effect-based/t_fib1.ml index 08a88384..e8d2f534 100644 --- a/test/effect-based/t_fib1.ml +++ b/test/effect-based/t_fib1.ml @@ -1,3 +1,5 @@ +[@@@ifge 5.0] + open Moonpool let rec fib_direct x = @@ -48,3 +50,5 @@ let () = (* now make sure we can do this with multiple pools in parallel *) let jobs = Array.init 2 (fun _ -> Thread.create run_test ()) in Array.iter Thread.join jobs + +[@@@endif] diff --git a/test/effect-based/t_fib_fork_join.ml b/test/effect-based/t_fib_fork_join.ml index 062bd3e6..c6898833 100644 --- a/test/effect-based/t_fib_fork_join.ml +++ b/test/effect-based/t_fib_fork_join.ml @@ -1,3 +1,5 @@ +[@@@ifge 5.0] + open Moonpool let rec fib_direct x = @@ -49,3 +51,5 @@ let () = (* now make sure we can do this with multiple pools in parallel *) let jobs = Array.init 2 (fun _ -> Thread.create run_test ()) in Array.iter Thread.join jobs + +[@@@endif] diff --git a/test/effect-based/t_fib_fork_join_all.ml b/test/effect-based/t_fib_fork_join_all.ml index 4539159d..7df4085c 100644 --- a/test/effect-based/t_fib_fork_join_all.ml +++ b/test/effect-based/t_fib_fork_join_all.ml @@ -1,3 +1,5 @@ +[@@@ifge 5.0] + open Moonpool let rec fib_direct x = @@ -40,3 +42,5 @@ let () = (* now make sure we can do this with multiple pools in parallel *) let jobs = Array.init 2 (fun _ -> Thread.create run_test ()) in Array.iter Thread.join jobs + +[@@@endif] diff --git a/test/effect-based/t_fork_join.ml b/test/effect-based/t_fork_join.ml index db831f65..9b050c21 100644 --- a/test/effect-based/t_fork_join.ml +++ b/test/effect-based/t_fork_join.ml @@ -1,3 +1,5 @@ +[@@@ifge 5.0] + open Moonpool let pool = Pool.create ~min:4 () @@ -36,3 +38,5 @@ let () = in let exp_sum = List.init 42 (fun x -> x * x) |> List.fold_left ( + ) 0 in assert (par_sum = exp_sum) + +[@@@endif] diff --git a/test/effect-based/t_futs1.ml b/test/effect-based/t_futs1.ml index aa974f45..be58f50b 100644 --- a/test/effect-based/t_futs1.ml +++ b/test/effect-based/t_futs1.ml @@ -1,3 +1,5 @@ +[@@@ifge 5.0] + open! Moonpool let pool = Pool.create ~min:4 () @@ -51,3 +53,5 @@ let () = in let fut = Fut.both f1 f2 in assert (Fut.wait_block fut = Ok (2, 20)) + +[@@@endif] diff --git a/test/effect-based/t_many.ml b/test/effect-based/t_many.ml index 7b29ae16..d8f3a7bd 100644 --- a/test/effect-based/t_many.ml +++ b/test/effect-based/t_many.ml @@ -1,3 +1,5 @@ +[@@@ifge 5.0] + open Moonpool let pool = Pool.create ~min:4 () @@ -27,3 +29,5 @@ let run () = assert (List.for_all (fun s -> s = n) lens) let () = run () + +[@@@endif] diff --git a/test/effect-based/t_sort.ml b/test/effect-based/t_sort.ml index 634d9f5d..a732c740 100644 --- a/test/effect-based/t_sort.ml +++ b/test/effect-based/t_sort.ml @@ -1,3 +1,5 @@ +[@@@ifge 5.0] + open Moonpool let rec select_sort arr i len = @@ -66,3 +68,5 @@ let () = (* Printf.printf "arr: [%s]\n%!" *) (* (String.concat ", " @@ List.map string_of_int @@ Array.to_list arr); *) assert (sorted arr) + +[@@@endif]