[PATCHv3 4/5] t7510: exit for loop with test result
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Jun 23, 2014, 07:05 UTC
- Message-ID
- <9013cca44cba0235e5fbb2f99f88cc6cbb0e0032.1403506792.git.git@drmicha.warpmail.net>
- In-Reply-To
- <cover.1402655838.git.git@drmicha.warpmail.net>
t7510 uses for loops in a subshell, which need to make sure that the test returns with the appropriate error code from within the loop.
Restructure the loops as the usual && chains with a single point of "exit 1" at the end of the loop to make this clearer.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> --- t/t7510-signed-commit.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh index 5ddac1a..96cfddf 100755 --- a/t/t7510-signed-commit.sh +++ b/t/t7510-signed-commit.sh @@ -50,7 +50,7 @@ test_expect_success GPG 'show signatures' ' for commit in initial second merge fourth-signed fifth-signed sixth-signed master do git show --pretty=short --show-signature $commit >actual && - grep "Good signature from" actual || exit 1 + grep "Good signature from" actual && ! grep "BAD signature from" actual || exit 1 echo $commit OK done @@ -59,7 +59,7 @@ test_expect_success GPG 'show signatures' ' for commit in merge^2 fourth-unsigned sixth-unsigned seventh-unsigned do git show --pretty=short --show-signature $commit >actual && - grep "Good signature from" actual && exit 1 + ! grep "Good signature from" actual && ! grep "BAD signature from" actual || exit 1 echo $commit OK done
-- 2.0.0.426.g37dbf84