From 50b9dd9b627ec51e3c1f7789d03a3578ed0f9744 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Thu, 10 Jul 2025 09:02:34 -0400 Subject: [PATCH] fix CI for lwt tests --- test/lwt/dune | 9 ++++++--- test/lwt/echo_client.ml | 8 +++++--- test/lwt/output_echo.expected | 1 - 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/test/lwt/dune b/test/lwt/dune index 78b19a6a..df9aa94a 100644 --- a/test/lwt/dune +++ b/test/lwt/dune @@ -36,9 +36,12 @@ (= %{system} "linux") (>= %{ocaml_version} 5.0))) (action - (with-stdout-to - %{targets} - (run ./run_echo.sh -n 10 --n-conn=2 -v)))) + (setenv + CI_MODE + 1 + (with-stdout-to + %{targets} + (run ./run_echo.sh -n 10 --n-conn=2 -v))))) (rule (alias runtest) diff --git a/test/lwt/echo_client.ml b/test/lwt/echo_client.ml index ba6cfea9..a25a9ba1 100644 --- a/test/lwt/echo_client.ml +++ b/test/lwt/echo_client.ml @@ -1,6 +1,7 @@ module M_lwt = Moonpool_lwt module Trace = Trace_core +let ci_mode = Option.is_some @@ Sys.getenv_opt "CI_MODE" let spf = Printf.sprintf let await_lwt = Moonpool_lwt.await_lwt let ( let@ ) = ( @@ ) @@ -68,9 +69,10 @@ let main ~port ~n ~n_conn ~verbose ~msg_per_conn () : unit = Printf.printf "all done\n%!"; let elapsed = Unix.gettimeofday () -. t0 in - Printf.printf " sent %d messages in %.4fs (%.2f msg/s)\n%!" !n_msg_total - elapsed - (float !n_msg_total /. elapsed); + if not ci_mode then + Printf.printf " sent %d messages in %.4fs (%.2f msg/s)\n%!" !n_msg_total + elapsed + (float !n_msg_total /. elapsed); () let () = diff --git a/test/lwt/output_echo.expected b/test/lwt/output_echo.expected index 7c6c88e3..5fdaef5d 100644 --- a/test/lwt/output_echo.expected +++ b/test/lwt/output_echo.expected @@ -1,7 +1,6 @@ run echo server on port=12346 listening on port 12346 run echo client -p 12346 -n 10 --n-conn=2 -v - sent 100 messages in 0.0175s (5720.16 msg/s) all done connecting to port 12346 (10 msg per conn, 10 conns total, 2 max at a time) read: hello 1