diff --git a/gix-dir/tests/fixtures/many-symlinks.sh b/gix-dir/tests/fixtures/many-symlinks.sh index fdebe1021a7..8d3d60e4865 100755 --- a/gix-dir/tests/fixtures/many-symlinks.sh +++ b/gix-dir/tests/fixtures/many-symlinks.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash set -eu -o pipefail -# Note that symlink creation fails on Windows for some reason, -# so these tests shouldn't be run there. +# These fixtures use symlinks. See `many.sh` for some that don't. git init breakout-symlink (cd breakout-symlink @@ -20,7 +19,7 @@ git init immediate-breakout-symlink git init excluded-symlinks-to-dir (cd excluded-symlinks-to-dir - cat <.gitignore + cat <<'EOF' >.gitignore src1 src2/ file1 @@ -42,4 +41,4 @@ EOF ln -s src/file file2 ) -ln -s excluded-symlinks-to-dir worktree-root-is-symlink \ No newline at end of file +ln -s excluded-symlinks-to-dir worktree-root-is-symlink diff --git a/gix-dir/tests/fixtures/many.sh b/gix-dir/tests/fixtures/many.sh index 54ec1cf8dac..268932ff3cc 100755 --- a/gix-dir/tests/fixtures/many.sh +++ b/gix-dir/tests/fixtures/many.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -eu -o pipefail -# Nothing here may use symlinks so these fixtures can be used on windows as well. +# These fixtures don't use symlinks. See `many-symlinks.sh` for some that do. git init with-nested-dot-git (cd with-nested-dot-git diff --git a/gix-dir/tests/walk/mod.rs b/gix-dir/tests/walk/mod.rs index 057271e0968..e4d08f7b0cf 100644 --- a/gix-dir/tests/walk/mod.rs +++ b/gix-dir/tests/walk/mod.rs @@ -19,7 +19,6 @@ use gix_dir::walk::ForDeletionMode; use gix_ignore::Kind::*; #[test] -#[cfg_attr(windows, ignore = "symlinks the way they are organized don't yet work on windows")] fn symlink_to_dir_can_be_excluded() -> crate::Result { let root = fixture_in("many-symlinks", "excluded-symlinks-to-dir"); let ((out, _root), entries) = collect(&root, None, |keep, ctx| { @@ -94,7 +93,6 @@ fn symlink_to_dir_can_be_excluded() -> crate::Result { } #[test] -#[cfg_attr(windows, ignore = "symlinks the way they are organized don't yet work on windows")] fn root_may_not_lead_through_symlinks() -> crate::Result { for (name, intermediate, expected) in [ ("immediate-breakout-symlink", "", 0), @@ -121,7 +119,6 @@ fn root_may_not_lead_through_symlinks() -> crate::Result { } #[test] -#[cfg_attr(windows, ignore = "symlinks the way they are organized don't yet work on windows")] fn root_may_be_a_symlink_if_it_is_the_worktree() -> crate::Result { let root = fixture_in("many-symlinks", "worktree-root-is-symlink"); let ((_out, _root), entries) = collect(&root, None, |keep, ctx| { @@ -2702,7 +2699,6 @@ fn decomposed_unicode_in_directory_is_returned_precomposed() -> crate::Result { } #[test] -#[cfg_attr(windows, ignore = "symlinks the way they are organized don't yet work on windows")] fn worktree_root_can_be_symlink() -> crate::Result { let root = fixture_in("many-symlinks", "symlink-to-breakout-symlink"); let troot = root.join("file");