diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2021-12-09 08:11:06 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-13 21:29:48 +0300 |
| commit | 74d2f5695dab4454097b2d1693f7206e8328724a (patch) | |
| tree | 6d4a147a909ef45477fd1509e83530b7ed39bec9 /t/t6407-merge-binary.sh | |
| parent | 0849541268a3aca9381591aed87b6864a203709b (diff) | |
tests: fix broken &&-chains in compound statements
The top-level &&-chain checker built into t/test-lib.sh causes tests to
magically exit with code 117 if the &&-chain is broken. However, it has
the shortcoming that the magic does not work within `{...}` groups,
`(...)` subshells, `$(...)` substitutions, or within bodies of compound
statements, such as `if`, `for`, `while`, `case`, etc. `chainlint.sed`
partly fills in the gap by catching broken &&-chains in `(...)`
subshells, but bugs can still lurk behind broken &&-chains in the other
cases.
Fix broken &&-chains in compound statements in order to reduce the
number of possible lurking bugs.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6407-merge-binary.sh')
| -rwxr-xr-x | t/t6407-merge-binary.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6407-merge-binary.sh b/t/t6407-merge-binary.sh index d4273f2575..4c4f690588 100755 --- a/t/t6407-merge-binary.sh +++ b/t/t6407-merge-binary.sh @@ -47,7 +47,7 @@ test_expect_success resolve ' echo Oops, should not have succeeded false else - git ls-files -s >current + git ls-files -s >current && test_cmp expect current fi ' @@ -62,7 +62,7 @@ test_expect_success recursive ' echo Oops, should not have succeeded false else - git ls-files -s >current + git ls-files -s >current && test_cmp expect current fi ' |