Skip to content

Commit 3adcfc5

Browse files
committed
Don't test jj_realistic_needs_to_be_more_clever on Windows
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 #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.
1 parent d00235a commit 3adcfc5

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

gix/tests/object/tree/diff.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -392,13 +392,12 @@ mod track_rewrites {
392392
}
393393

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

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

0 commit comments

Comments
 (0)