Fixes

Author: Martin Taillefer (from Dev Box)

crates/cargo-gamma-engine/src/parse/nesting.rs

@@ -332,7 +332,7 @@ fn identifier_end(text: &str, at: usize) -> Option<usize> {
 
 #[cfg(test)]
 mod tests {
-    use std::fs;
+    use std::{env, fs};
 
     use camino::Utf8Path;
     use walkdir::WalkDir;
@@ -531,8 +531,13 @@ mod tests {
     /// The counts added here are proxies, and a proxy that refuses ordinary Rust is worse than the
     /// crash it prevents. This is the check that keeps them calibrated against real code.
     #[test]
-
     fn this_workspace_is_within_the_limit() {
+        // Gamma's scratch tree contains instrumented source whose guard expressions are
+        // intentionally deeper than the source this calibration test is meant to measure.
+        let _ = env::var_os("CARGO_GAMMA").is_none().then(assert_workspace_is_within_limit);
+    }
+
+    fn assert_workspace_is_within_limit() {
         let root = Utf8Path::new(env!("CARGO_MANIFEST_DIR")).join("..");
 
         for entry in WalkDir::new(root.as_std_path()).into_iter().filter_map(Result::ok) {

crates/cargo-gamma-lib/src/testing.rs

@@ -829,6 +829,10 @@ mod tests {
     /// The watchdog returns what the closure returned, and does it on the closure's own thread.
     #[test]
     fn a_closure_that_finishes_gets_its_value_back() {
+        if std::env::var_os(crate::exec::UNDER_GAMMA_VAR).is_some() {
+            return;
+        }
+
         let id = within(WATCHDOG, "reporting a thread id", || thread::current().id());
 
         assert_eq!(within(WATCHDOG, "adding", || 21 + 21), 42);
@@ -845,6 +849,10 @@ mod tests {
     /// the helper promises to do.
     #[test]
     fn a_body_that_never_finishes_is_reported_as_hung() {
+        if std::env::var_os(crate::exec::UNDER_GAMMA_VAR).is_some() {
+            return;
+        }
+
         let (release, released) = mpsc::channel::<()>();
         let hung = panic::catch_unwind(|| {
             within(Duration::from_millis(50), "a deliberately hung body", move || {

crates/cargo-gamma-lib/tests/cli.rs

@@ -578,7 +578,9 @@ fn a_redirected_runtime_dependency_keeps_the_feature_gating_its_own_api() {
     let runtime = camino::Utf8Path::new(env!("CARGO_MANIFEST_DIR"))
         .parent()
         .expect("this crate lives one level below `crates`")
-        .join("cargo-gamma-rt");
+        .join("cargo-gamma-rt")
+        .into_string()
+        .replace('\\', "/");
 
     // Cargo paths are portable when written with `/`, including on Windows; a native path with
     // `\` is a string-escape sequence to a TOML parser, so writing it verbatim breaks on Windows.