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>
Elijah Newren committed
Mar 20, 2021 at 00:03 UTC
f3b964a07ef70eee6bacefd1ed5f94eb871be902
2 files changed
+3
ci/run-build-and-tests.sh
+1
@@ -16,6 +16,7 @@ linux-gcc)
16
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
17
make test
18
export GIT_TEST_SPLIT_INDEX=yes
19
+ export GIT_TEST_MERGE_ALGORITHM=recursive
20
export GIT_TEST_FULL_IN_PACK_ARRAY=true
21
export GIT_TEST_OE_SIZE=10
22
export GIT_TEST_OE_DELTA_SIZE=5
t/test-lib.sh
+2
@@ -448,6 +448,8 @@ export EDITOR
448
449
GIT_DEFAULT_HASH="${GIT_TEST_DEFAULT_HASH:-sha1}"
450
export GIT_DEFAULT_HASH
451
+GIT_TEST_MERGE_ALGORITHM="${GIT_TEST_MERGE_ALGORITHM:-ort}"
452
+export GIT_TEST_MERGE_ALGORITHM
453
454
# Tests using GIT_TRACE typically don't want <timestamp> <file>:<line> output
455
GIT_TRACE_BARE=1