Skip to content

Commit bca8248

Browse files
committed
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) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011f9aeQCvWWdzt7JSfNCfxa
1 parent c2be854 commit bca8248

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

‎crates/socket-patch-core/src/vendor/jvm/scala_cli.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,9 @@ mod tests {
686686
// Bloop evidence of a build after vendoring (it lists the root
687687
// file), newer than every input, resolving the GAV outside the
688688
// tree: a command-line `-r` or a repository declared elsewhere won.
689-
let ws = root.canonicalize().unwrap();
689+
// Bloop writes plain paths, never Windows' `\\?\` verbatim form
690+
// that `canonicalize` returns there.
691+
let ws = crate::crawlers::sbt_evidence::strip_verbatim(&root.canonicalize().unwrap());
690692
let sources: Vec<_> = [PROJECT_FILE, "main.scala", ROOT_FILE]
691693
.iter()
692694
.map(|f| ws.join(f))

0 commit comments

Comments
 (0)