t: detect and signal failure within loop
Failures within `for` and `while` loops can go unnoticed if not detected and signaled manually since the loop itself does not abort when a contained command fails, nor will a failure necessarily be detected when the loop finishes since the loop returns the exit code of the last command it ran on the final iteration, which may not be the command which failed. Therefore, detect and signal failures manually within loops using the idiom `|| return 1` (or `|| exit 1` within subshells). Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
625ff5c320
commit
0e66bc1b21
@ -249,7 +249,7 @@ test_expect_success "Cleanup temp and matrix branches" "
|
||||
do
|
||||
for fsm_val in $fsm_values
|
||||
do
|
||||
cleanup $uc_val $fsm_val
|
||||
cleanup $uc_val $fsm_val || return 1
|
||||
done
|
||||
done
|
||||
"
|
||||
|
@ -556,7 +556,7 @@ test_expect_success 'blame with pathspec inside sparse definition' '
|
||||
deep/deeper1/a \
|
||||
deep/deeper1/deepest/a
|
||||
do
|
||||
test_all_match git blame $file
|
||||
test_all_match git blame $file || return 1
|
||||
done
|
||||
'
|
||||
|
||||
@ -1571,7 +1571,7 @@ test_expect_success 'sparse index is not expanded: blame' '
|
||||
deep/deeper1/a \
|
||||
deep/deeper1/deepest/a
|
||||
do
|
||||
ensure_not_expanded blame $file
|
||||
ensure_not_expanded blame $file || return 1
|
||||
done
|
||||
'
|
||||
|
||||
@ -1907,7 +1907,7 @@ test_expect_success 'rm pathspec outside sparse definition' '
|
||||
test_sparse_match test_must_fail git rm $file &&
|
||||
test_sparse_match test_must_fail git rm --cached $file &&
|
||||
test_sparse_match git rm --sparse $file &&
|
||||
test_sparse_match git status --porcelain=v2
|
||||
test_sparse_match git status --porcelain=v2 || return 1
|
||||
done &&
|
||||
|
||||
cat >folder1-full <<-EOF &&
|
||||
|
@ -29,7 +29,7 @@ basic_cruft_pack_tests () {
|
||||
while read oid
|
||||
do
|
||||
path="$objdir/$(test_oid_to_path "$oid")" &&
|
||||
printf "%s %d\n" "$oid" "$(test-tool chmtime --get "$path")"
|
||||
printf "%s %d\n" "$oid" "$(test-tool chmtime --get "$path")" || exit 1
|
||||
done |
|
||||
sort -k1
|
||||
) >expect &&
|
||||
@ -232,7 +232,7 @@ test_expect_success 'cruft tags rescue tagged objects' '
|
||||
while read oid
|
||||
do
|
||||
test-tool chmtime -1000 \
|
||||
"$objdir/$(test_oid_to_path $oid)"
|
||||
"$objdir/$(test_oid_to_path $oid)" || exit 1
|
||||
done <objects &&
|
||||
|
||||
test-tool chmtime -500 \
|
||||
@ -272,7 +272,7 @@ test_expect_success 'cruft commits rescue parents, trees' '
|
||||
while read object
|
||||
do
|
||||
test-tool chmtime -1000 \
|
||||
"$objdir/$(test_oid_to_path $object)"
|
||||
"$objdir/$(test_oid_to_path $object)" || exit 1
|
||||
done <objects &&
|
||||
test-tool chmtime +500 "$objdir/$(test_oid_to_path \
|
||||
$(git rev-parse HEAD))" &&
|
||||
@ -345,7 +345,7 @@ test_expect_success 'expired objects are pruned' '
|
||||
while read object
|
||||
do
|
||||
test-tool chmtime -1000 \
|
||||
"$objdir/$(test_oid_to_path $object)"
|
||||
"$objdir/$(test_oid_to_path $object)" || exit 1
|
||||
done <objects &&
|
||||
|
||||
keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
|
||||
|
@ -725,7 +725,7 @@ test_expect_success 'avoid assuming we detected renames' '
|
||||
mkdir unrelated &&
|
||||
for i in $(test_seq 1 10)
|
||||
do
|
||||
>unrelated/$i
|
||||
>unrelated/$i || exit 1
|
||||
done &&
|
||||
test_seq 2 10 >numbers &&
|
||||
test_seq 12 20 >values &&
|
||||
|
Loading…
Reference in New Issue
Block a user