read-cache.c: make $GIT_TEST_SPLIT_INDEX boolean

pclouds · gitster · commit 4c2db93807f5 · 2018-04-16T12:38:58.000+09:00
While at there, document about this special mode when running the test
suite.

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
-	GIT_TEST_SPLIT_INDEX=YesPlease make --quiet test
+	GIT_TEST_SPLIT_INDEX=yes make --quiet test
 fi
 
 check_unignored_build_artifacts
diff --git 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 (getenv("GIT_TEST_SPLIT_INDEX"))
+		if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0))
 			init_split_index(istate);
 	}
 
@@ -2559,7 +2559,7 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
 		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;
diff --git 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.
 
 
+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
 ------------
 

Original file line number	Diff line number	Diff line change
`@@ -2268,7 +2268,7 @@ static int do_write_index(struct index_state istate, struct tempfile tempfile,`
`2268`	`2268`
`2269`	`2269`	`if (!istate->version) {`
`2270`	`2270`	`istate->version = get_index_format_default();`
`2271`		`- if (getenv("GIT_TEST_SPLIT_INDEX"))`
	`2271`	`+ if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0))`
`2272`	`2272`	`init_split_index(istate);`
`2273`	`2273`	`}`
`2274`	`2274`
`@@ -2559,7 +2559,7 @@ int write_locked_index(struct index_state istate, struct lock_file lock,`
`2559`	`2559`	`goto out;`
`2560`	`2560`	`}`
`2561`	`2561`
`2562`		`- if (getenv("GIT_TEST_SPLIT_INDEX")) {`
	`2562`	`+ if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0)) {`
`2563`	`2563`	`int v = si->base_sha1[0];`
`2564`	`2564`	`if ((v & 15) < 6)`
`2565`	`2565`	`istate->cache_changed \|= SPLIT_INDEX_ORDERED;`