Skip to content

Commit

Permalink
Don't test jj_realistic_needs_to_be_more_clever on Windows
Browse files Browse the repository at this point in the history
This conditionally marks the `jj_realistic_needs_to_be_more_clever`
test as ignored, when the target is Windows. But the test is still
built on Windows, and can be run with:

    cargo nextest run -p gix -- --ignored jj_realistic_needs_to_be_more_clever

This is a workaround for GitoxideLabs#1575.

When run on Windows, the test previously checked if it was running
on CI and skipped its contents. This removes that logic, since the
test no longer runs by default on CI or otherwise.
  • Loading branch information
EliahKagan committed Sep 6, 2024
1 parent d00235a commit 3adcfc5
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions gix/tests/object/tree/diff.rs
Original file line number Diff line number Diff line change
Expand Up @@ -392,13 +392,12 @@ mod track_rewrites {
}

#[test]
#[cfg_attr(
windows,
ignore = "Fails on some Window systems, like the fixture doesn't get set up correctly."
)]
fn jj_realistic_needs_to_be_more_clever() -> crate::Result {
let repo = named_subrepo_opts("make_diff_repos.sh", "jj-trackcopy-1", gix::open::Options::isolated())?;
if cfg!(windows) && is_ci::cached() {
// Somehow, CI has problems getting the same result even though it works fine in a local VM.
// It's like the fixture doesn't get setup correctly.
return Ok(());
}

let mut expected = HashMap::<&BStr, (&BStr, u32)>::new();
expected.insert(
Expand Down

0 comments on commit 3adcfc5

Please sign in to comment.