mirror of
https://github.com/git/git.git
synced 2024-05-19 23:26:13 +02:00
f06481f127
There are a number of tests that the "recursive" backend does not handle correctly but which the redesign in "ort" will. Add a new helper in lib-merge.sh for selecting a different test expectation based on the setting of GIT_TEST_MERGE_ALGORITHM, and use it in various testcases to document which ones we expect to fail under recursive but pass under ort. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
14 lines
268 B
Bash
14 lines
268 B
Bash
# Helper functions used by merge tests.
|
|
|
|
test_expect_merge_algorithm () {
|
|
status_for_recursive=$1 status_for_ort=$2
|
|
shift 2
|
|
|
|
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
|
|
then
|
|
test_expect_${status_for_ort} "$@"
|
|
else
|
|
test_expect_${status_for_recursive} "$@"
|
|
fi
|
|
}
|