test: fix some tests (foundry-rs#5691)

Author: DaniPopes

crates/chisel/src/executor.rs

@@ -1343,7 +1343,6 @@ impl<'a> Iterator for InstructionIter<'a> {
 mod tests {
     use super::*;
     use ethers_solc::{error::SolcError, Solc};
-    use once_cell::sync::Lazy;
     use std::sync::Mutex;
 
     #[test]
@@ -1613,25 +1612,31 @@ mod tests {
     #[track_caller]
     fn source() -> SessionSource {
         // synchronize solc install
-        static PRE_INSTALL_SOLC_LOCK: Lazy<Mutex<bool>> = Lazy::new(|| Mutex::new(false));
+        static PRE_INSTALL_SOLC_LOCK: Mutex<bool> = Mutex::new(false);
 
         // on some CI targets installing results in weird malformed solc files, we try installing it
         // multiple times
+        let version = "0.8.19";
         for _ in 0..3 {
             let mut is_preinstalled = PRE_INSTALL_SOLC_LOCK.lock().unwrap();
             if !*is_preinstalled {
-                let solc =
-                    Solc::find_or_install_svm_version("0.8.19").and_then(|solc| solc.version());
-                if solc.is_err() {
-                    // try reinstalling
-                    let solc = Solc::blocking_install(&"0.8.19".parse().unwrap());
-                    if solc.map_err(SolcError::from).and_then(|solc| solc.version()).is_ok() {
-                        *is_preinstalled = true;
+                let solc = Solc::find_or_install_svm_version(version)
+                    .and_then(|solc| solc.version().map(|v| (solc, v)));
+                match solc {
+                    Ok((solc, v)) => {
+                        // successfully installed
+                        eprintln!("found installed Solc v{v} @ {}", solc.solc.display());
                         break
                     }
-                } else {
-                    // successfully installed
-                    break
+                    Err(e) => {
+                        // try reinstalling
+                        eprintln!("error: {e}\n trying to re-install Solc v{version}");
+                        let solc = Solc::blocking_install(&version.parse().unwrap());
+                        if solc.map_err(SolcError::from).and_then(|solc| solc.version()).is_ok() {
+                            *is_preinstalled = true;
+                            break
+                        }
+                    }
                 }
             }
         }

crates/forge/tests/cli/script.rs

@@ -751,7 +751,7 @@ forgetest_async!(
         let run_log = re.replace_all(&run_log, "");
 
         // Clean up carriage return OS differences
-        let re = Regex::new(r"\\r\\n").unwrap();
+        let re = Regex::new(r"\r\n").unwrap();
         let fixtures_log = re.replace_all(&fixtures_log, "\n");
         let run_log = re.replace_all(&run_log, "\n");