mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
tests: fix negated test_i18ngrep calls
The helper function test_i18ngrep pretends that it found the expected results when it is running under GETTEXT_POISON. For this reason, it must not be used negated like so ! test_i18ngrep foo bar because the test case would fail under GETTEXT_POISON. The function offers a special syntax to test that a pattern is *not* found: test_i18ngrep ! foo bar Convert incorrect uses to this syntax. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
67de23ddb1
commit
41ca19b6a6
|
@ -52,15 +52,15 @@ do
|
|||
echo "*.java diff=$p" >.gitattributes &&
|
||||
test_expect_code 1 git diff --no-index \
|
||||
A.java B.java 2>msg &&
|
||||
! test_i18ngrep fatal msg &&
|
||||
! test_i18ngrep error msg
|
||||
test_i18ngrep ! fatal msg &&
|
||||
test_i18ngrep ! error msg
|
||||
'
|
||||
test_expect_success "builtin $p wordRegex pattern compiles" '
|
||||
echo "*.java diff=$p" >.gitattributes &&
|
||||
test_expect_code 1 git diff --no-index --word-diff \
|
||||
A.java B.java 2>msg &&
|
||||
! test_i18ngrep fatal msg &&
|
||||
! test_i18ngrep error msg
|
||||
test_i18ngrep ! fatal msg &&
|
||||
test_i18ngrep ! error msg
|
||||
'
|
||||
done
|
||||
|
||||
|
|
|
@ -145,7 +145,7 @@ test_expect_success 'exit when p4 fails to produce marshaled output' '
|
|||
test_expect_code 1 git p4 clone --dest="$git" //depot >errs 2>&1
|
||||
) &&
|
||||
cat errs &&
|
||||
! test_i18ngrep Traceback errs
|
||||
test_i18ngrep ! Traceback errs
|
||||
'
|
||||
|
||||
# Hide a file from p4d, make sure we catch its complaint. This won't fail in
|
||||
|
|
|
@ -404,7 +404,7 @@ test_expect_success 'submit --prepare-p4-only' '
|
|||
git p4 submit --prepare-p4-only >out &&
|
||||
test_i18ngrep "prepared for submission" out &&
|
||||
test_i18ngrep "must be deleted" out &&
|
||||
! test_i18ngrep "everything below this line is just the diff" out
|
||||
test_i18ngrep ! "everything below this line is just the diff" out
|
||||
) &&
|
||||
(
|
||||
cd "$cli" &&
|
||||
|
|
Loading…
Reference in a new issue