tests: disable GIT_TEST_SPLIT_INDEX for sparse index tests

The sparse index and split index features are said to be currently
incompatible [1], and consequently GIT_TEST_SPLIT_INDEX=1 might
interfere with the test cases exercising the sparse index feature.
Therefore GIT_TEST_SPLIT_INDEX is already explicitly disabled for the
whole of 't1092-sparse-checkout-compatibility.sh'.  There are,
however, two other test cases exercising sparse index, namely
'sparse-index enabled and disabled' in
't1091-sparse-checkout-builtin.sh' and 'status succeeds with sparse
index' in 't7519-status-fsmonitor.sh', and these two could fail with
GIT_TEST_SPLIT_INDEX=1 as well [2].

Unset GIT_TEST_SPLIT_INDEX and disable the split index in these two
test cases to avoid such interference.

Note that this is the minimal change to merely avoid failures when
these test cases are run with GIT_TEST_SPLIT_INDEX=1.  Interestingly,
though, without these changes the 'git sparse-checkout init --cone
--sparse-index' commands still succeed even with split index, and set
all the necessary configuration variables and create the initial
'$GIT_DIR/info/sparse-checkout' file, but the test failures are caused
by later sanity checks finding that the index is not in fact a sparse
index.  This indicates that 'git sparse-checkout init --sparse-index'
lacks some error checking and its tests lack coverage related to split
index, but fixing those issues is beyond the scope of this patch
series.

[1] https://public-inbox.org/git/48e9c3d6-407a-1843-2d91-22112410e3f8@gmail.com/

[2] Neither of these test cases fail at the moment, because
    GIT_TEST_SPLIT_INDEX=1 is broken and never splits the index, and
    it broke long before the sparse index feature was added.
    This patch series is about to fix GIT_TEST_SPLIT_INDEX, and then
    both test cases mentioned above would fail.

(The diff is best viewed with '--ignore-all-space')

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Acked-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh
index 71236981e6484f3d2fc0dde9ec7e0ea52f7a6d73..8675ad51543d360758b96dd8caef403270c9ea58 100755 (executable)
--- a/t/t1091-sparse-checkout-builtin.sh
+++ b/t/t1091-sparse-checkout-builtin.sh
@@ -206,16 +206,21 @@ test_expect_success 'sparse-checkout disable' '
 '
 
 test_expect_success 'sparse-index enabled and disabled' '
-       git -C repo sparse-checkout init --cone --sparse-index &&
-       test_cmp_config -C repo true index.sparse &&
-       test-tool -C repo read-cache --table >cache &&
-       grep " tree " cache &&
-
-       git -C repo sparse-checkout disable &&
-       test-tool -C repo read-cache --table >cache &&
-       ! grep " tree " cache &&
-       git -C repo config --list >config &&
-       ! grep index.sparse config
+       (
+               sane_unset GIT_TEST_SPLIT_INDEX &&
+               git -C repo update-index --no-split-index &&
+
+               git -C repo sparse-checkout init --cone --sparse-index &&
+               test_cmp_config -C repo true index.sparse &&
+               test-tool -C repo read-cache --table >cache &&
+               grep " tree " cache &&
+
+               git -C repo sparse-checkout disable &&
+               test-tool -C repo read-cache --table >cache &&
+               ! grep " tree " cache &&
+               git -C repo config --list >config &&
+               ! grep index.sparse config
+       )
 '
 
 test_expect_success 'cone mode: init and set' '

diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index f1463197b99c84555f9d6615cd8320f380217ad5..f488d930dfd73f37b1c01b52d4ce5732b38e1d8a 100755 (executable)
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -399,41 +399,45 @@ check_sparse_index_behavior () {
 }
 
 test_expect_success 'status succeeds with sparse index' '
-       git clone . full &&
-       git clone --sparse . sparse &&
-       git -C sparse sparse-checkout init --cone --sparse-index &&
-       git -C sparse sparse-checkout set dir1 dir2 &&
+       (
+               sane_unset GIT_TEST_SPLIT_INDEX &&
 
-       write_script .git/hooks/fsmonitor-test <<-\EOF &&
-               printf "last_update_token\0"
-       EOF
-       git -C full config core.fsmonitor ../.git/hooks/fsmonitor-test &&
-       git -C sparse config core.fsmonitor ../.git/hooks/fsmonitor-test &&
-       check_sparse_index_behavior ! &&
+               git clone . full &&
+               git clone --sparse . sparse &&
+               git -C sparse sparse-checkout init --cone --sparse-index &&
+               git -C sparse sparse-checkout set dir1 dir2 &&
 
-       write_script .git/hooks/fsmonitor-test <<-\EOF &&
-               printf "last_update_token\0"
-               printf "dir1/modified\0"
-       EOF
-       check_sparse_index_behavior ! &&
-
-       git -C sparse sparse-checkout add dir1a &&
+               write_script .git/hooks/fsmonitor-test <<-\EOF &&
+                       printf "last_update_token\0"
+               EOF
+               git -C full config core.fsmonitor ../.git/hooks/fsmonitor-test &&
+               git -C sparse config core.fsmonitor ../.git/hooks/fsmonitor-test &&
+               check_sparse_index_behavior ! &&
 
-       for repo in full sparse
-       do
-               cp -r $repo/dir1 $repo/dir1a &&
-               git -C $repo add dir1a &&
-               git -C $repo commit -m "add dir1a" || return 1
-       done &&
-       git -C sparse sparse-checkout set dir1 dir2 &&
-
-       # This one modifies outside the sparse-checkout definition
-       # and hence we expect to expand the sparse-index.
-       write_script .git/hooks/fsmonitor-test <<-\EOF &&
-               printf "last_update_token\0"
-               printf "dir1a/modified\0"
-       EOF
-       check_sparse_index_behavior
+               write_script .git/hooks/fsmonitor-test <<-\EOF &&
+                       printf "last_update_token\0"
+                       printf "dir1/modified\0"
+               EOF
+               check_sparse_index_behavior ! &&
+
+               git -C sparse sparse-checkout add dir1a &&
+
+               for repo in full sparse
+               do
+                       cp -r $repo/dir1 $repo/dir1a &&
+                       git -C $repo add dir1a &&
+                       git -C $repo commit -m "add dir1a" || return 1
+               done &&
+               git -C sparse sparse-checkout set dir1 dir2 &&
+
+               # This one modifies outside the sparse-checkout definition
+               # and hence we expect to expand the sparse-index.
+               write_script .git/hooks/fsmonitor-test <<-\EOF &&
+                       printf "last_update_token\0"
+                       printf "dir1a/modified\0"
+               EOF
+               check_sparse_index_behavior
+       )
 '
 
 test_done