diff options
author | Elijah Newren <newren@gmail.com> | 2020-10-26 20:01:36 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-10-26 22:31:23 +0300 |
commit | f06481f12732e846c0572a0109e2c5b5684f508a (patch) | |
tree | d757e3872eac53647d2c0f100de08763189ae8b8 /t/t6426-merge-skip-unneeded-updates.sh | |
parent | c64432aacda9054459ce550eca95929897c301bd (diff) |
t/: new helper for tests that pass with ort but fail with recursive
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>
Diffstat (limited to 't/t6426-merge-skip-unneeded-updates.sh')
-rwxr-xr-x | t/t6426-merge-skip-unneeded-updates.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t6426-merge-skip-unneeded-updates.sh b/t/t6426-merge-skip-unneeded-updates.sh index 699813671c..d7eeee4310 100755 --- a/t/t6426-merge-skip-unneeded-updates.sh +++ b/t/t6426-merge-skip-unneeded-updates.sh @@ -23,6 +23,7 @@ test_description="merge cases" # files that might be renamed into each other's paths.) . ./test-lib.sh +. "$TEST_DIRECTORY"/lib-merge.sh ########################################################################### @@ -666,7 +667,7 @@ test_setup_4a () { # correct requires doing the merge in-memory first, then realizing that no # updates to the file are necessary, and thus that we can just leave the path # alone. -test_expect_failure '4a: Change on A, change on B subset of A, dirty mods present' ' +test_expect_merge_algorithm failure success '4a: Change on A, change on B subset of A, dirty mods present' ' test_setup_4a && ( cd 4a && |