summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-03-20 00:03:56 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-03-20 12:35:40 -0700
commitf3b964a07ef70eee6bacefd1ed5f94eb871be902 (patch)
treeca830b0647420ea4da668b0d462fb54620f31977 /ci
parentt6423: mark remaining expected failure under merge-ort as such (diff)
downloadtgif-f3b964a07ef70eee6bacefd1ed5f94eb871be902.tar.xz
Add testing with merge-ort merge strategy
In preparation for switching from merge-recursive to merge-ort as the default strategy, have the testsuite default to running with merge-ort. Keep coverage of the recursive backend by having the linux-gcc job run with it. Signed-off-by: Elijah Newren <newren@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/run-build-and-tests.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 50e0b90073..2279ff70a7 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -16,6 +16,7 @@ linux-gcc)
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
make test
export GIT_TEST_SPLIT_INDEX=yes
+ export GIT_TEST_MERGE_ALGORITHM=recursive
export GIT_TEST_FULL_IN_PACK_ARRAY=true
export GIT_TEST_OE_SIZE=10
export GIT_TEST_OE_DELTA_SIZE=5