Try cleanup

Author: jfldde

src/node.rs

@@ -119,7 +119,7 @@ where
 
         let kind = config.kind();
 
-        debug!("Spawning {kind} with config {config:?}",);
+        debug!("Spawning {kind} with config {config:?}");
 
         let stdout_path = config.log_path();
         let stdout_file = File::create(&stdout_path).context("Failed to create stdout file")?;
@@ -138,28 +138,27 @@ where
             .map(|(k, v)| (k, v.to_string()))
             .collect();
 
-        if let Ok(llvm_profile_file) = std::env::var("LLVM_PROFILE_FILE") {
-            let dir = std::path::Path::new(&llvm_profile_file)
-                .parent()
-                .unwrap_or(std::path::Path::new("target/llvm-cov-target"));
+        // if let Ok(llvm_profile_file) = std::env::var("LLVM_PROFILE_FILE") {
+        //     let dir = std::path::Path::new(&llvm_profile_file)
+        //         .parent()
+        //         .unwrap_or(std::path::Path::new("target/llvm-cov-target"));
 
-            let filename = format!("citrea-{}-%p-%m.profraw", kind);
+        //     let filename = format!("citrea-{}-%p-%m.profraw", kind);
 
-            let modified_profile = dir.join(filename).to_string_lossy().into_owned();
+        //     let modified_profile = dir.join(filename).to_string_lossy().into_owned();
 
-            println!(
-                "Modified LLVM_PROFILE_FILE from {} to: {}",
-                llvm_profile_file, modified_profile
-            );
-            env_vars.push(("LLVM_PROFILE_FILE", modified_profile));
-        }
+        //     println!(
+        //         "Modified LLVM_PROFILE_FILE from {} to: {}",
+        //         llvm_profile_file, modified_profile
+        //     );
+        //     env_vars.push(("LLVM_PROFILE_FILE", modified_profile));
+        // }
 
-        for var in &["RUSTFLAGS", "CARGO_LLVM_COV"] {
+        for var in &["RUSTFLAGS", "CARGO_LLVM_COV", "LLVM_PROFILE_FILE"] {
             if let Ok(val) = std::env::var(var) {
                 env_vars.push((var, val));
             }
         }
-        println!("env_vars : {:?}", env_vars);
 
         Command::new(&citrea)
             .args(get_citrea_args(config))

src/traits.rs

@@ -42,8 +42,10 @@ pub trait NodeT: Send {
                     signal::kill(Pid::from_raw(pid as i32), Signal::SIGTERM)
                         .context("Failed to send SIGTERM signal to process")?;
 
-                    // Try sleeping for now
-                    tokio::time::sleep(Duration::from_millis(5000)).await;
+                    // TODO Sleep until coverage file is written
+                    if std::env::var("CARGO_LLVM_COV").is_ok() {
+                        tokio::time::sleep(Duration::from_millis(5000)).await;
+                    }
                 } else {
                     info!("Process ID not found Killing process");
                     process.kill().await.context("Failed to kill process")?;