diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-07-17 10:47:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-17 10:47:25 -0700 |
| commit | b19a8c00c6e85245b1cd5c5ca2cfb7c58fb11452 (patch) | |
| tree | a41f08c36bb8cf7e1f6826bf36ffc6a48d3d720f /t/chainlint/cuddled-if-then-else.expect | |
| parent | 6da44da936d8256438aca9c7e027b7dc5e405b07 (diff) | |
| parent | 55fe61559e8ef9e99274d9e649b0fac627a34ba9 (diff) | |
| download | git-b19a8c00c6e85245b1cd5c5ca2cfb7c58fb11452.tar.gz | |
Merge branch 'jk/test-body-in-here-doc'
The test framework learned to take the test body not as a single
string but as a here-document.
* jk/test-body-in-here-doc:
t/.gitattributes: ignore whitespace in chainlint expect files
t: convert some here-doc test bodies
test-lib: allow test snippets as here-docs
chainlint.pl: add tests for test body in heredoc
chainlint.pl: recognize test bodies defined via heredoc
chainlint.pl: check line numbers in expected output
chainlint.pl: force CRLF conversion when opening input files
chainlint.pl: do not spawn more threads than we have scripts
chainlint.pl: only start threads if jobs > 1
chainlint.pl: add test_expect_success call to test snippets
Diffstat (limited to 't/chainlint/cuddled-if-then-else.expect')
| -rw-r--r-- | t/chainlint/cuddled-if-then-else.expect | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/chainlint/cuddled-if-then-else.expect b/t/chainlint/cuddled-if-then-else.expect index 1d8ed58c49..72da8794cb 100644 --- a/t/chainlint/cuddled-if-then-else.expect +++ b/t/chainlint/cuddled-if-then-else.expect @@ -1,6 +1,6 @@ -(if test -z ""; then - echo empty - else - echo bizzy - fi) && -echo foobar +2 (if test -z ""; then +3 echo empty +4 else +5 echo bizzy +6 fi) && +7 echo foobar |