read-cache.c: make $GIT_TEST_SPLIT_INDEX boolean

While at there, document about this special mode when running the test
suite.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 3735ce413f1835b3222fab05ba9ff5ab5205c2c0..8190a753de3e99231c8284eb5e1b8f216cc89251 100755 (executable)
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -11,7 +11,7 @@ make --jobs=2
 make --quiet test
 if test "$jobname" = "linux-gcc"
 then
 make --quiet test
 if test "$jobname" = "linux-gcc"
 then

-       GIT_TEST_SPLIT_INDEX=YesPlease make --quiet test
+       GIT_TEST_SPLIT_INDEX=yes make --quiet test

 fi
 
 check_unignored_build_artifacts
 fi
 
 check_unignored_build_artifacts

diff --git a/read-cache.c b/read-cache.c
index 10f1c6bb8a316e85448445afc3478c832d61709c..fa3df2e72e0a520b2bc1ad5fdcb93beed445bfa0 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -2268,7 +2268,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 
        if (!istate->version) {
                istate->version = get_index_format_default();
 
        if (!istate->version) {
                istate->version = get_index_format_default();

-               if (getenv("GIT_TEST_SPLIT_INDEX"))
+               if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0))

                        init_split_index(istate);
        }
 
                        init_split_index(istate);
        }
 


@@ -2559,7 +2559,7 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
                goto out;
        }
 
                goto out;
        }
 

-       if (getenv("GIT_TEST_SPLIT_INDEX")) {
+       if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0)) {

                int v = si->base_sha1[0];
                if ((v & 15) < 6)
                        istate->cache_changed |= SPLIT_INDEX_ORDERED;
                int v = si->base_sha1[0];
                if ((v & 15) < 6)
                        istate->cache_changed |= SPLIT_INDEX_ORDERED;

diff --git a/t/README b/t/README
index 24ddebfabf97be1251452fe5b6bba847597431fd..d5e0a3c786d6439550f21bf6c4ad0b387b15a2b4 100644 (file)
--- a/t/README
+++ b/t/README
@@ -293,6 +293,17 @@ and know what setup is needed for it.  Or when you want to run
 everything up to a certain test.
 
 
 everything up to a certain test.
 
 

+Running tests with special setups
+---------------------------------
+
+The whole test suite could be run to test some special features
+that cannot be easily covered by a few specific test cases. These
+could be enabled by running the test suite with correct GIT_TEST_
+environment set.
+
+GIT_TEST_SPLIT_INDEX=<boolean> forces split-index mode on the whole
+test suite. Accept any boolean values that are accepted by git-config.
+

 Naming Tests
 ------------
 
 Naming Tests
 ------------