From: Garima Singh <garima.singh@xxxxxxxxxxxxx> Add GIT_TEST_COMMIT_GRAPH_BLOOM_FILTERS test flag to the test setup suite in order to toggle writing bloom filters when running any of the git tests. If set to true, we will compute and write bloom filters every time a test calls `git commit-graph write`. The test suite passes when GIT_TEST_COMMIT_GRAPH and GIT_COMMIT_GRAPH_BLOOM_FILTERS are enabled. Helped-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx> Signed-off-by: Garima Singh <garima.singh@xxxxxxxxxxxxx> --- builtin/commit-graph.c | 2 +- ci/run-build-and-tests.sh | 1 + commit-graph.h | 1 + t/README | 3 +++ t/t4216-log-bloom.sh | 3 +++ t/t5318-commit-graph.sh | 2 ++ t/t5324-split-commit-graph.sh | 1 + t/t5325-commit-graph-bloom.sh | 3 +++ 8 files changed, 15 insertions(+), 1 deletion(-) diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 9bd1e11161..97167959b2 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -146,7 +146,7 @@ static int graph_write(int argc, const char **argv) flags |= COMMIT_GRAPH_WRITE_SPLIT; if (opts.progress) flags |= COMMIT_GRAPH_WRITE_PROGRESS; - if (opts.enable_bloom_filters) + if (opts.enable_bloom_filters || git_env_bool(GIT_TEST_COMMIT_GRAPH_BLOOM_FILTERS, 0)) flags |= COMMIT_GRAPH_WRITE_BLOOM_FILTERS; read_replace_refs = 0; diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh index ff0ef7f08e..19d0846d34 100755 --- a/ci/run-build-and-tests.sh +++ b/ci/run-build-and-tests.sh @@ -19,6 +19,7 @@ linux-gcc) export GIT_TEST_OE_SIZE=10 export GIT_TEST_OE_DELTA_SIZE=5 export GIT_TEST_COMMIT_GRAPH=1 + export GIT_TEST_COMMIT_GRAPH_BLOOM_FILTERS=1 export GIT_TEST_MULTI_PACK_INDEX=1 make test ;; diff --git a/commit-graph.h b/commit-graph.h index 2202ad91ae..d914e6abf1 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -8,6 +8,7 @@ #define GIT_TEST_COMMIT_GRAPH "GIT_TEST_COMMIT_GRAPH" #define GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD "GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD" +#define GIT_TEST_COMMIT_GRAPH_BLOOM_FILTERS "GIT_TEST_COMMIT_GRAPH_BLOOM_FILTERS" struct commit; struct bloom_filter_settings; diff --git a/t/README b/t/README index caa125ba9a..399b190437 100644 --- a/t/README +++ b/t/README @@ -378,6 +378,9 @@ GIT_TEST_COMMIT_GRAPH=<boolean>, when true, forces the commit-graph to be written after every 'git commit' command, and overrides the 'core.commitGraph' setting to true. +GIT_TEST_COMMIT_GRAPH_BLOOM_FILTERS=<boolean>, when true, forces commit-graph +write to compute and write bloom filters for every 'git commit-graph write' + GIT_TEST_FSMONITOR=$PWD/t7519/fsmonitor-all exercises the fsmonitor code path for utilizing a file system monitor to speed up detecting new or changed files. diff --git a/t/t4216-log-bloom.sh b/t/t4216-log-bloom.sh index d42f077998..0e092b387c 100755 --- a/t/t4216-log-bloom.sh +++ b/t/t4216-log-bloom.sh @@ -3,6 +3,9 @@ test_description='git log for a path with bloom filters' . ./test-lib.sh +GIT_TEST_COMMIT_GRAPH=0 +GIT_TEST_COMMIT_GRAPH_BLOOM_FILTERS=0 + test_expect_success 'setup repo' ' git init && git config core.commitGraph true && diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index 3f03de6018..613228bb12 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -3,6 +3,8 @@ test_description='commit graph' . ./test-lib.sh +GIT_TEST_COMMIT_GRAPH_BLOOM_FILTERS=0 + test_expect_success 'setup full repo' ' mkdir full && cd "$TRASH_DIRECTORY/full" && diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh index c24823431f..181ca7e0cb 100755 --- a/t/t5324-split-commit-graph.sh +++ b/t/t5324-split-commit-graph.sh @@ -4,6 +4,7 @@ test_description='split commit graph' . ./test-lib.sh GIT_TEST_COMMIT_GRAPH=0 +GIT_TEST_COMMIT_GRAPH_BLOOM_FILTERS=0 test_expect_success 'setup repo' ' git init && diff --git a/t/t5325-commit-graph-bloom.sh b/t/t5325-commit-graph-bloom.sh index d7ef0e7fb3..a9c9e9fef6 100755 --- a/t/t5325-commit-graph-bloom.sh +++ b/t/t5325-commit-graph-bloom.sh @@ -3,6 +3,9 @@ test_description='commit graph with bloom filters' . ./test-lib.sh +GIT_TEST_COMMIT_GRAPH=0 +GIT_TEST_COMMIT_GRAPH_BLOOM_FILTERS=0 + test_expect_success 'setup repo' ' git init && git config core.commitGraph true && -- gitgitgadget
