test: make sure to wait long enough batch mode (rdbg -in)

bin/rdbgwrap.ml

-(* Time-stamp: <modified the 20/06/2022 (at 14:05) by Erwan Jahier> *)
+(* Time-stamp: <modified the 27/10/2022 (at 16:46) by Erwan Jahier> *)
 (** A wrapper around rdbg-top to 
     - avoid typing "()" and ";;" 
     - generate initial sessions
@@ -84,20 +84,28 @@ let rdbg_cmd = ref "*"
 let rec my_read_line ic =
   try
     let str = flush stdout; input_line ic in
+    (* Printf.printf "rdbg: my_read_line <- '%s'\n" str; *)
     match str with
     | "#auto" -> 
-       add_semi_ref:= true;
-       print_string "type '#auto_off' to disable automatic semicolumn mode\n";
-       flush stdout;
-       my_read_line ic
+      add_semi_ref:= true;
+      print_string "type '#auto_off' to disable automatic semicolumn mode\n";
+      flush stdout;
+      my_read_line ic
     | "#auto_off" ->
-       add_semi_ref := false; 
-       print_string "type '#auto' to enable automatic semicolumn mode\n";
-       flush stdout;
-       my_read_line ic
+      add_semi_ref := false; 
+      print_string "type '#auto' to enable automatic semicolumn mode\n";
+      flush stdout;
+      my_read_line ic
     | "" -> if !rdbg_cmd = "" then my_read_line ic else !rdbg_cmd
     | _ -> str
-  with End_of_file -> Unix.sleep 1; "q"
+  with
+    End_of_file ->
+    if !input_file <> None then (
+      print_string "End_of_file: wait a little...\n";
+      flush stdout;
+      Unix.sleep 2; (* should be higher than the Thread.delay below *)
+    );
+    "q"
 
          
 let log_oc = if !log then open_out "rdbg.log" else stdout
@@ -314,19 +322,19 @@ let rec myloop ic_stdout ic_stderr ic oc str =
     if start_with str "man" then "RdbgMain.man" 
     else
       (* sugaring help and apropos *)
-      if start_with str "help " && not (String.contains str '\"') then
-        Printf.sprintf "help \"%s\"" (String.sub str 5 (s-5))
-      else if start_with str "h " && not (String.contains str '\"') then
-        Printf.sprintf "help \"%s\"" (String.sub str 2 (s-2))
-      else if start_with str "apropos " && not (String.contains str '\"') then
-        Printf.sprintf "apropos \"%s\"" (String.sub str 8 (s-8))
-      else if start_with str "a " && not (String.contains str '\"') then
-        Printf.sprintf "apropos \"%s\"" (String.sub str 2 (s-2))
-      else if str ="a" || str = "apropos" then
-        Printf.sprintf "apropos \"\""
-      else if str ="h" || str = "help" then
-        Printf.sprintf "RdbgMain.man"
-      else str
+    if start_with str "help " && not (String.contains str '\"') then
+      Printf.sprintf "help \"%s\"" (String.sub str 5 (s-5))
+    else if start_with str "h " && not (String.contains str '\"') then
+      Printf.sprintf "help \"%s\"" (String.sub str 2 (s-2))
+    else if start_with str "apropos " && not (String.contains str '\"') then
+      Printf.sprintf "apropos \"%s\"" (String.sub str 8 (s-8))
+    else if start_with str "a " && not (String.contains str '\"') then
+      Printf.sprintf "apropos \"%s\"" (String.sub str 2 (s-2))
+    else if str ="a" || str = "apropos" then
+      Printf.sprintf "apropos \"\""
+    else if str ="h" || str = "help" then
+      Printf.sprintf "RdbgMain.man"
+    else str
   in
   let str =
     if ((str.[0] = ' ' || start_with str "let ") && not (has_semicol str))
@@ -334,7 +342,7 @@ let rec myloop ic_stdout ic_stderr ic oc str =
   in
   let add_par = if String.contains str ' ' then "" else "()" in
   let semicol = if (!add_semi_ref && str.[0] <> ' ') && not (has_semicol str) 
-                then ";;" else ""
+    then ";;" else ""
   in
   if start_with str  "wait " then (
     (* useful for rdbg scripts run via --input when the RP don't wait before exiting *)
@@ -342,9 +350,9 @@ let rec myloop ic_stdout ic_stderr ic oc str =
     let t = try int_of_string t with _ ->
       Printf.printf "fail to parse int (do not use spaces before your int)\n%!" ; 1
     in
-      Printf.printf "wait %d seconds (%s)\n%!" t str;
-      Unix.sleep t;
-      myloop ic_stdout ic_stderr ic oc (my_read_line ic)
+    Printf.printf "wait %d seconds (%s)\n%!" t str;
+    Unix.sleep t;
+    myloop ic_stdout ic_stderr ic oc (my_read_line ic)
   )
   else if str = "q" || str = "quit" then (
     ignore (Unix.close_process_full (ic_stdout,  oc, ic_stderr)); flush_all();
@@ -352,7 +360,7 @@ let rec myloop ic_stdout ic_stderr ic oc str =
   else (
     rdbg_cmd := if !rdbg_cmd = "*" then "" else str;
     let str = str ^ add_par ^ semicol in
-    if !verbose then 
+    if !verbose || !RdbgWrapperArgs.input_file <> None then
       Printf.printf "rdbg sends to the ocaml toplevel the string: \"%s\"\n%!" str;
     output_string oc (str ^ "\n");
     flush oc;
@@ -384,11 +392,11 @@ let rdbg_session_manager outc =
          read user input, 
          create a new session if asked
          launch the chosen session
-   *)
+  *)
   let ic, close_ic = match !RdbgWrapperArgs.input_file with
     | None -> stdin, fun () -> ()
     | Some f ->
-       if Sys.file_exists f then (
+      if Sys.file_exists f then (
          Printf.printf "rdbg: reading commands from %s.\n%!" f;
          let ic = open_in f in
          ic, (fun () -> Printf.printf "rdbg: %s have been processed.\n%!" f; close_in ic)
@@ -411,7 +419,7 @@ let rdbg_session_manager outc =
       if !first then Thread.delay 1.5;
       (* not  a big deal, but  otherwise, the ocamltop process  do not
          have the time to write on its stdout, and only the first read
-         can take case of hiding the ocaml loading msgs.  *)
+         can take care of hiding the ocaml loading msgs.  *)
       flush_all(); 
       Thread.delay 0.05;
       read_rdbgtop_out oc ic_stdout ic_stderr !first !first;

exemples/session/test1-session

 ni 189
-cgf
+cg

lib/rdbgWrapperArgs.ml

-(* Time-stamp: <modified the 30/06/2021 (at 10:22) by Erwan Jahier> *)
+(* Time-stamp: <modified the 26/10/2022 (at 16:10) by Erwan Jahier> *)
 
 let rdbg_tuning_file = "my-rdbg-tuning.ml"
 let rdbg_cmds_file = "rdbg-cmds.ml"
@@ -141,7 +141,7 @@ let (mkoptab : unit -> unit) =
           ["Set the output file name (currently,  \""^ !output_file ^ "\")" ];
     mkopt ["-in";"--input"]  ~cat: More
           (Arg.String (fun str -> input_file := Some str))
-          ["Read rdbg command in a file and exits"];
+          ["Read rdbg command in a file and exit"];
     mkopt ["-norif";"--no-rif"]  ~cat: More
           (Arg.Unit (fun () -> no_rif := true))
           ["Do not print data in the rif file (useful when there are too many variables)";