Without wait the behaviour is correct, the error message is missing though

Signed-off-by: Ambre Austen Suhamy <[email protected]>

Author: ElectreAAS

bin/build.ml

@@ -203,10 +203,10 @@ let build =
          perform the RPC call.
       *)
       Rpc_common.run_via_rpc
-        ~builder
-        ~common
-        ~config
+        builder
         lock_held_by
+        common
+        config
         (Rpc.Build.build ~wait:true)
         targets
     | Ok () ->

bin/fmt.ml

@@ -49,7 +49,7 @@ let run_fmt_command ~common ~config ~preview =
       Scheduler.go_without_rpc_server ~common ~config (fun () ->
         Rpc_common.fire_request
           ~name:"format"
-          ~wait:true
+          ~wait:false
           Dune_rpc.Procedures.Public.format
           ())
     in

bin/promotion.ml

@@ -63,13 +63,13 @@ module Apply = struct
         Diff_promotion.promote_files_registered_in_last_run files_to_promote)
     | Error lock_held_by ->
       Rpc_common.run_via_rpc
-        ~builder
-        ~common
-        ~config
+        builder
         lock_held_by
+        common
+        config
         (Rpc_common.fire_request
            ~name:"promote_many"
-           ~wait:true
+           ~wait:false
            Dune_rpc_private.Procedures.Public.promote_many)
         files_to_promote
   ;;

bin/rpc/rpc_common.ml

@@ -84,9 +84,9 @@ let fire_request ~name ~wait request arg =
     ~f:(fun client -> request_exn client request arg)
 ;;
 
-let wrap_build_outcome_exn ~print_on_success f args () =
+let wrap_build_outcome_exn ~print_on_success f arg () =
   let open Fiber.O in
-  let+ response = f args in
+  let+ response = f arg in
   match response with
   | Error (error : Rpc_error.t) -> raise_rpc_error error
   | Ok Dune_rpc.Build_outcome_with_diagnostics.Success ->
@@ -118,11 +118,11 @@ let warn_ignore_arguments lock_held_by =
     ]
 ;;
 
-let run_via_rpc ~builder ~common ~config lock_held_by f args =
+let run_via_rpc builder lock_held_by common config request arg =
   if not (Common.Builder.equal builder Common.Builder.default)
   then warn_ignore_arguments lock_held_by;
   Scheduler.go_without_rpc_server
     ~common
     ~config
-    (wrap_build_outcome_exn ~print_on_success:true f args)
+    (wrap_build_outcome_exn ~print_on_success:true request arg)
 ;;

bin/rpc/rpc_common.mli

@@ -44,10 +44,10 @@ val warn_ignore_arguments : Dune_util.Global_lock.Lock_held_by.t -> unit
 
 (**  Schedule a fiber to run via RPC, wrapping any errors. *)
 val run_via_rpc
-  :  builder:Common.Builder.t
-  -> common:Common.t
-  -> config:Dune_config_file.Dune_config.t
+  :  Common.Builder.t
   -> Dune_util.Global_lock.Lock_held_by.t
+  -> Common.t
+  -> Dune_config_file.Dune_config.t
   -> ('a
       -> (Dune_rpc.Build_outcome_with_diagnostics.t, Dune_rpc.Response.Error.t) result
            Fiber.t)

bin/runtest.ml

@@ -49,13 +49,13 @@ let runtest_term =
            ~to_cwd:(Common.root common).to_cwd)
   | Error lock_held_by ->
     Rpc_common.run_via_rpc
-      ~builder
-      ~common
-      ~config
+      builder
       lock_held_by
+      common
+      config
       (Rpc_common.fire_request
          ~name:"runtest"
-         ~wait:true
+         ~wait:false
          Dune_rpc.Procedures.Public.runtest)
       dir_or_cram_test_paths
 ;;

test/blackbox-tests/test-cases/cram/custom-build-dir.t

@@ -10,8 +10,6 @@ path
   >   $ dune runtest
   > EOF
 
-  $ dune rpc ping --wait
-
   $ DUNE_BUILD_DIR=$PWD/tmp dune runtest --auto-promote
   File "foo.t", line 1, characters 0-0:
   Error: Files
@@ -23,7 +21,11 @@ path
     $TESTCASE_ROOT/tmp/default/foo.t.corrected
     to foo.t.
   [1]
-  $ sed -E '/\(pid: [0-9]+\)/{s//(pid: ###)/; s/instance.*/.../g; q;}' foo.t
+  $ sed -E 's/[0-9]+\)/###)/g' foo.t
     $ echo "  $ echo bar" >bar.t
     $ dune runtest
-    Error: A running dune (pid: ###) ...
+    Warning:
+    Your build request is being forwarded to a running Dune instance (pid:
+    ###). Note that certain command line arguments may be ignored.
+    Error: RPC server not running.
+    [1]

test/blackbox-tests/test-cases/watching/watching-eager-concurrent-runtest-command.t

@@ -20,7 +20,7 @@ starts immediately.
 
 Test that we can run a test while another instance of dune is running in watch
 mode:
-  $ dune runtest 2>&1 | sed 's/pid: [0-9]*/pid: PID/g'
+  $ dune runtest 2>&1
   Success
 
 Test that passing extra arguments to `dune runtest` prints a warning when