From bca824822040bf42f007a80b06e890ec5ffee48f Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 7 Nov 2026 06:50:44 +0000 Subject: [PATCH] Fix Windows-only scala_cli liveness test failure liveness_needs_the_committed_tree_and_no_shadowing_repository (added in #2030) has failed the nightly Windows test leg since it landed. It builds Bloop evidence from root.canonicalize(), which on Windows returns a \\?\ verbatim path. Real Bloop never writes that form, and scala_evidence::is_stale strips it from the root before matching, so none of the listed sources sat under the root, project.scala read as unlisted, the evidence counted as stale and liveness stayed Ok(true) where the test wants scala_cli_repository_shadowed. Strip the verbatim prefix in the test, as hosted/sbt_reads.rs does, so the fixture matches what Bloop writes. Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_011f9aeQCvWWdzt7JSfNCfxa --- crates/socket-patch-core/src/vendor/jvm/scala_cli.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/socket-patch-core/src/vendor/jvm/scala_cli.rs b/crates/socket-patch-core/src/vendor/jvm/scala_cli.rs index 9972c8142..59fbb6a0e 100644 --- a/crates/socket-patch-core/src/vendor/jvm/scala_cli.rs +++ b/crates/socket-patch-core/src/vendor/jvm/scala_cli.rs @@ -686,7 +686,9 @@ mod tests { // Bloop evidence of a build after vendoring (it lists the root // file), newer than every input, resolving the GAV outside the // tree: a command-line `-r` or a repository declared elsewhere won. - let ws = root.canonicalize().unwrap(); + // Bloop writes plain paths, never Windows' `\\?\` verbatim form + // that `canonicalize` returns there. + let ws = crate::crawlers::sbt_evidence::strip_verbatim(&root.canonicalize().unwrap()); let sources: Vec<_> = [PROJECT_FILE, "main.scala", ROOT_FILE] .iter() .map(|f| ws.join(f))