Merge remote-tracking branch 'tor-github/pr/397'

This commit is contained in:
Nick Mathewson 2018-11-02 10:01:26 -04:00
commit f57fd0318a
2 changed files with 6 additions and 3 deletions

3
changes/ticket28006 Normal file
View File

@ -0,0 +1,3 @@
o Code simplification and refactoring:
- Fix issues that shellcheck found in chutney-git-bisect.sh.
Resolves ticket 28006.

View File

@ -20,7 +20,7 @@ if [ ! -z "$1" ]; then
fi fi
if [ ! -z "$2" ]; then if [ ! -z "$2" ]; then
cd "$2" cd "$2" || exit
fi fi
CHUTNEY_TEST_CMD="make test-network-all" CHUTNEY_TEST_CMD="make test-network-all"
@ -54,9 +54,9 @@ while [ "$i" -le "$CHUTNEY_TRIES" ]; do
echo "test '$CHUTNEY_TEST_CMD' succeeded after $i/$CHUTNEY_TRIES attempts, good" echo "test '$CHUTNEY_TEST_CMD' succeeded after $i/$CHUTNEY_TRIES attempts, good"
exit 0 exit 0
fi fi
i=$[$i+1] i=$((i+1))
done done
i=$[$i-1] i=$((i-1))
echo "test '$CHUTNEY_TEST_CMD' failed $i/$CHUTNEY_TRIES attempts, bad" echo "test '$CHUTNEY_TEST_CMD' failed $i/$CHUTNEY_TRIES attempts, bad"
exit 1 exit 1