mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/test-i18ngrep'

Browse Source 
Another step to deprecate test_i18ngrep.

* jc/test-i18ngrep:
  tests: teach callers of test_i18ngrep to use test_grep
  test framework: further deprecate test_i18ngrep
This commit is contained in:
Junio C Hamano
2023-11-08 11:04:02 +09:00
parent ca320b256c 6789275d37
commit a8e2394704
226 changed files with 1212 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
t/t0040-parse-options.sh
View File

@ -374,34 +374,34 @@ test_expect_success 'OPT_CMDMODE() works' '
test_expect_success 'OPT_CMDMODE() detects incompatibility (1)' '
test_must_fail test-tool parse-options --mode1 --mode2 >output 2>output.err &&
test_must_be_empty output &&
test_i18ngrep "mode1" output.err &&
test_i18ngrep "mode2" output.err &&
test_i18ngrep "is incompatible with" output.err
test_grep "mode1" output.err &&
test_grep "mode2" output.err &&
test_grep "is incompatible with" output.err
'
test_expect_success 'OPT_CMDMODE() detects incompatibility (2)' '
test_must_fail test-tool parse-options --set23 --mode2 >output 2>output.err &&
test_must_be_empty output &&
test_i18ngrep "mode2" output.err &&
test_i18ngrep "set23" output.err &&
test_i18ngrep "is incompatible with" output.err
test_grep "mode2" output.err &&
test_grep "set23" output.err &&
test_grep "is incompatible with" output.err
'
test_expect_success 'OPT_CMDMODE() detects incompatibility (3)' '
test_must_fail test-tool parse-options --mode2 --set23 >output 2>output.err &&
test_must_be_empty output &&
test_i18ngrep "mode2" output.err &&
test_i18ngrep "set23" output.err &&
test_i18ngrep "is incompatible with" output.err
test_grep "mode2" output.err &&
test_grep "set23" output.err &&
test_grep "is incompatible with" output.err
'
test_expect_success 'OPT_CMDMODE() detects incompatibility (4)' '
test_must_fail test-tool parse-options --mode2 --mode34=3 \
>output 2>output.err &&
test_must_be_empty output &&
test_i18ngrep "mode2" output.err &&
test_i18ngrep "mode34.3" output.err &&
test_i18ngrep "is incompatible with" output.err
test_grep "mode2" output.err &&
test_grep "mode34.3" output.err &&
test_grep "is incompatible with" output.err
'
test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' '