Split clean_up_artifacts_on_startup into setup for build_files and log_files separately; fixes a corner case in test build

lukstafi · lukstafi · commit 0ef10a60fee1 · 2025-08-19T16:44:31.000+02:00
Signed-off-by: Lukasz Stafiniak &lt;lukstafi@gmail.com&gt;
diff --git a/arrayjit/lib/utils.ml b/arrayjit/lib/utils.ml
@@ -257,26 +257,28 @@ let diagn_log_file fname =
 
 let () =
   (* Cleanup needs to happen before get_local_debug_runtime (or any other code is run). *)
-  let clean_up_artifacts_on_startup =
-    get_global_flag ~default:true ~arg_name:"clean_up_artifacts_on_startup"
+  let remove_dir_if_exists dirname =
+    if Stdlib.Sys.file_exists dirname && Stdlib.Sys.is_directory dirname then
+      try
+        Array.iter (Stdlib.Sys.readdir dirname) ~f:(fun fname ->
+            Stdlib.Sys.remove (Stdlib.Filename.concat dirname fname));
+        Stdlib.Sys.rmdir dirname
+      with exn ->
+        Stdio.eprintf "Failed to delete directory %s: %s\n%!" dirname (Exn.to_string exn)
+    else if Stdlib.Sys.file_exists dirname then
+      try Stdlib.Sys.remove dirname
+      with exn ->
+        Stdio.eprintf "Failed to delete file %s (expected a directory): %s\n%!" dirname
+          (Exn.to_string exn)
   in
-  if clean_up_artifacts_on_startup then (
-    let remove_dir_if_exists dirname =
-      if Stdlib.Sys.file_exists dirname && Stdlib.Sys.is_directory dirname then
-        try
-          Array.iter (Stdlib.Sys.readdir dirname) ~f:(fun fname ->
-              Stdlib.Sys.remove (Stdlib.Filename.concat dirname fname));
-          Stdlib.Sys.rmdir dirname
-        with exn ->
-          Stdio.eprintf "Failed to delete directory %s: %s\n%!" dirname (Exn.to_string exn)
-      else if Stdlib.Sys.file_exists dirname then
-        try Stdlib.Sys.remove dirname
-        with exn ->
-          Stdio.eprintf "Failed to delete file %s (expected a directory): %s\n%!" dirname
-            (Exn.to_string exn)
-    in
-    remove_dir_if_exists "log_files";
-    remove_dir_if_exists "build_files")
+  let clean_up_log_files_on_startup =
+    get_global_flag ~default:true ~arg_name:"clean_up_log_files_on_startup"
+  in
+  if clean_up_log_files_on_startup then remove_dir_if_exists "log_files";
+  let clean_up_build_files_on_startup =
+    get_global_flag ~default:true ~arg_name:"clean_up_build_files_on_startup"
+  in
+  if clean_up_build_files_on_startup then remove_dir_if_exists "build_files"
 
 let get_local_debug_runtime =
   let snapshot_every_sec =
diff --git a/ocannl_config.example b/ocannl_config.example
@@ -52,8 +52,11 @@ check_half_prec_constants_cutoff=16384.0
 #   recent modification.
 automatic_host_transfers=true
 
-# If true (the default), the directories log_files and build_files are deleted on startup.
-clean_up_artifacts_on_startup=true
+# If true, the build_files directory is deleted on startup.
+clean_up_build_files_on_startup=true
+
+# If true, the log_files directory is deleted on startup.
+clean_up_log_files_on_startup=true
 
 # Other configurations:
 
diff --git a/test/config/ocannl_config b/test/config/ocannl_config
@@ -8,4 +8,5 @@ prefer_backend_uniformity=true
 default_prec=single
 fixed_state_for_init=42
 # Don't delete files as tests might be running in parallel deleting each-other's files.
-clean_up_artifacts_on_startup=false
+clean_up_build_files_on_startup=false
+clean_up_log_files_on_startup=false
diff --git a/test/operations/dune b/test/operations/dune
@@ -30,7 +30,7 @@
     "--ocannl_log_main_domain_to_stdout=false"
     "--ocannl_debug_log_to_stream_files=true"
     ; We have to clean up to avoid appending to results of a previous run
-    "--ocannl_clean_up_artifacts_on_startup=true")
+    "--ocannl_clean_up_log_files_on_startup=true")
    (write-file %{targets} "completed\n"))))
 
 ; Step 2: Process the log file, depending on the backend-specific sentinel
