Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t4153: fix negated test_i18ngrep call
author
Vasco Almeida
<vascomalmeida@sapo.pt>
Fri, 17 Jun 2016 20:21:10 +0000
(20:21 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 17 Jun 2016 22:45:48 +0000
(15:45 -0700)
The function test_i18ngrep fakes success when run under GETTEXT_POISON.
Hence, running in the following manner will always fail under gettext
poison:
! test_i18ngrep expected actual
Use correct syntax: test_i18ngrep ! expected actual
For other instance of this issue see
41ca19b
("tests: fix negated
test_i18ngrep calls", 2014-08-13).
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4153-am-resume-override-opts.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
f9b3242
)
diff --git
a/t/t4153-am-resume-override-opts.sh
b/t/t4153-am-resume-override-opts.sh
index 7c013d84d5978edf3760c48e0125c3527c8e09f9..8ea22d1bcbb8340d32fe87f299a77c98362c3797 100755
(executable)
--- a/
t/t4153-am-resume-override-opts.sh
+++ b/
t/t4153-am-resume-override-opts.sh
@@
-53,7
+53,7
@@
test_expect_success '--no-quiet overrides --quiet' '
# Applying side1 will be quiet.
test_must_fail git am --quiet side[123].eml >out &&
test_path_is_dir .git/rebase-apply &&
# Applying side1 will be quiet.
test_must_fail git am --quiet side[123].eml >out &&
test_path_is_dir .git/rebase-apply &&
-
! test_i18ngrep
"^Applying: " out &&
+
test_i18ngrep !
"^Applying: " out &&
echo side1 >file &&
git add file &&
echo side1 >file &&
git add file &&