mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-15 17:03:14 +01:00
Code

Merge branch 'ab/detox-gettext-tests' into next

Browse Source 
Test clean-up.

* ab/detox-gettext-tests:
  tests: remove all uses of test_i18cmp
This commit is contained in:
Junio C Hamano 2021-04-15 13:38:08 -07:00
commit db0da2903a
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t3437-rebase-fixup-options.sh
View File

@ -157,7 +157,7 @@ test_expect_success 'sequence of fixup, fixup -C & squash --signoff works' '
git -c commit.status=false rebase -ik --signoff A && git -c commit.status=false rebase -ik --signoff A &&
git diff-tree --exit-code --patch HEAD B3 -- && git diff-tree --exit-code --patch HEAD B3 -- &&
test_cmp_rev HEAD^ A && test_cmp_rev HEAD^ A &&
test_i18ncmp "$TEST_DIRECTORY/t3437/expected-squash-message" \ test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
actual-squash-message actual-squash-message
' '
@ -191,7 +191,7 @@ test_expect_success 'sequence squash, fixup & fixup -c gives combined message' '
FAKE_LINES="1 squash 2 fixup 3 fixup_-c 4" \ FAKE_LINES="1 squash 2 fixup 3 fixup_-c 4" \
FAKE_MESSAGE_COPY=actual-combined-message \ FAKE_MESSAGE_COPY=actual-combined-message \
git -c commit.status=false rebase -i A && git -c commit.status=false rebase -i A &&
test_i18ncmp "$TEST_DIRECTORY/t3437/expected-combined-message" \ test_cmp "$TEST_DIRECTORY/t3437/expected-combined-message" \
actual-combined-message && actual-combined-message &&
test_cmp_rev HEAD^ A test_cmp_rev HEAD^ A
' '
@ -204,7 +204,7 @@ test_expect_success 'fixup -C works upon --autosquash with amend!' '
--signoff A && --signoff A &&
git diff-tree --exit-code --patch HEAD B3 -- && git diff-tree --exit-code --patch HEAD B3 -- &&
test_cmp_rev HEAD^ A && test_cmp_rev HEAD^ A &&
test_i18ncmp "$TEST_DIRECTORY/t3437/expected-squash-message" \ test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
actual-squash-message actual-squash-message
' '

6
t/t6300-for-each-ref.sh
View File

@ -945,9 +945,9 @@ test_failing_trailer_option () {
test_expect_success "$title" ' test_expect_success "$title" '
# error message cannot be checked under i18n # error message cannot be checked under i18n
test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual && test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual &&
test_i18ncmp expect actual && test_cmp expect actual &&
test_must_fail git for-each-ref --format="%(contents:$option)" refs/heads/main 2>actual && test_must_fail git for-each-ref --format="%(contents:$option)" refs/heads/main 2>actual &&
test_i18ncmp expect actual test_cmp expect actual
' '
} }
@ -966,7 +966,7 @@ test_expect_success 'if arguments, %(contents:trailers) shows error if colon is
fatal: unrecognized %(contents) argument: trailersonly fatal: unrecognized %(contents) argument: trailersonly
EOF EOF
test_must_fail git for-each-ref --format="%(contents:trailersonly)" 2>actual && test_must_fail git for-each-ref --format="%(contents:trailersonly)" 2>actual &&
test_i18ncmp expect actual test_cmp expect actual
' '
test_expect_success 'basic atom: head contents:trailers' ' test_expect_success 'basic atom: head contents:trailers' '

7
t/test-lib-functions.sh
View File

@ -1025,13 +1025,6 @@ test_cmp_bin () {
cmp "$@" cmp "$@"
} }
# Wrapper for test_cmp which used to be used for
# GIT_TEST_GETTEXT_POISON=false. Only here as a shim for other
# in-flight changes. Should not be used and will be removed soon.
test_i18ncmp () {
test_cmp "$@"
}
# Wrapper for grep which used to be used for # Wrapper for grep which used to be used for
# GIT_TEST_GETTEXT_POISON=false. Only here as a shim for other # GIT_TEST_GETTEXT_POISON=false. Only here as a shim for other
# in-flight changes. Should not be used and will be removed soon. # in-flight changes. Should not be used and will be removed soon.