test/lwt/dune

@@ -16,7 +16,7 @@
  (action
   (with-stdout-to
    %{targets}
-   (run ./run_hash.sh -d ../data/ --n-conn=2))))
+   (run ./run_hash.sh -d ../data/ --n-conn=2 -j=4))))
 
 (rule
  (alias runtest)
@@ -36,12 +36,9 @@
    (= %{system} "linux")
    (>= %{ocaml_version} 5.0)))
  (action
-  (setenv
+  (with-stdout-to
-   CI_MODE
+   %{targets}
-   1
+   (run ./run_echo.sh -n 10 --n-conn=2 -j=4))))
-   (with-stdout-to
-    %{targets}
-    (run ./run_echo.sh -n 10 --n-conn=2 -v)))))
 
 (rule
  (alias runtest)

test/lwt/echo_client.ml

@@ -1,7 +1,6 @@
 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@ ) = ( @@ )
@@ -69,10 +68,9 @@ let main ~port ~n ~n_conn ~verbose ~msg_per_conn () : unit =
 
   Printf.printf "all done\n%!";
   let elapsed = Unix.gettimeofday () -. t0 in
-  if not ci_mode then
+  Printf.printf "  sent %d messages in %.4fs (%.2f msg/s)\n%!" !n_msg_total
-    Printf.printf "  sent %d messages in %.4fs (%.2f msg/s)\n%!" !n_msg_total
+    elapsed
-      elapsed
+    (float !n_msg_total /. elapsed);
-      (float !n_msg_total /. elapsed);
   ()
 
 let () =

test/lwt/output_echo.expected

@@ -1,8 +1,8 @@
 run echo server on port=12346
 listening on port 12346
-run echo client -p 12346 -n 10 --n-conn=2 -v
+run echo client -p 12346 -n 10 --n-conn=2 -j=4
 all done
-connecting to port 12346 (10 msg per conn, 10 conns total, 2 max at a time)
+connecting to port 12346
 read: hello 1
 read: hello 1
 read: hello 1

test/lwt/output_hash.expected

@@ -1,6 +1,7 @@
 running hash server on port=12345
 listening on port 12345
-run hash client -p 12345 -d ../data/ --n-conn=2
+listening on port=12345
+run hash client -p 12345 -d ../data/ --n-conn=2 -j=4
 ../data/d1/large: fdb479c5661572f9606266eeb280b4db5c26cc38
 ../data/d1/large: fdb479c5661572f9606266eeb280b4db5c26cc38
 ../data/d1/large_10: c31560efa1a5ad6dbf89990d51878f3bd64b13ce