mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
t: simplify loop exit-code status variables
Since shell loops may drop the exit code of failed commands inside the loop, some tests try to keep track of the status by setting a variable. This can end up cumbersome and hard to read; it is much simpler to just exit directly from the loop using "return 1" (since each case is either in a helper function or inside a test snippet). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e6821d09e4
commit
c6587bddc4
|
@ -18,22 +18,16 @@ test_expect_success setup '
|
|||
|
||||
echo file >expected &&
|
||||
mkdir sub &&
|
||||
bad= &&
|
||||
for n in 0 1 2 3 4 5
|
||||
do
|
||||
for m in 0 1 2 3 4 5 6 7 8 9
|
||||
do
|
||||
num=00$n$m &&
|
||||
>sub/file-$num &&
|
||||
echo file-$num >>expected || {
|
||||
bad=t
|
||||
break
|
||||
}
|
||||
done && test -z "$bad" || {
|
||||
bad=t
|
||||
break
|
||||
}
|
||||
done && test -z "$bad" &&
|
||||
echo file-$num >>expected ||
|
||||
return 1
|
||||
done
|
||||
done &&
|
||||
git add . &&
|
||||
git commit -m "add a bunch of files" &&
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ test_description='i18n settings and format-patch | am pipe'
|
|||
|
||||
check_encoding () {
|
||||
# Make sure characters are not corrupted
|
||||
cnt="$1" header="$2" i=1 j=0 bad=0
|
||||
cnt="$1" header="$2" i=1 j=0
|
||||
while test "$i" -le $cnt
|
||||
do
|
||||
git format-patch --encoding=UTF-8 --stdout HEAD~$i..HEAD~$j |
|
||||
|
@ -20,14 +20,10 @@ check_encoding () {
|
|||
grep "^encoding ISO8859-1" ;;
|
||||
*)
|
||||
grep "^encoding ISO8859-1"; test "$?" != 0 ;;
|
||||
esac || {
|
||||
bad=1
|
||||
break
|
||||
}
|
||||
esac || return 1
|
||||
j=$i
|
||||
i=$(($i+1))
|
||||
done
|
||||
(exit $bad)
|
||||
}
|
||||
|
||||
test_expect_success setup '
|
||||
|
|
Loading…
Reference in a new issue