Simpily errexit modifications

This commit is contained in:
Carsten Grohmann 2021-10-26 14:17:51 +02:00 committed by Andrew Gaul
parent ea3c21f270
commit 0abeec9cae
2 changed files with 3 additions and 3 deletions

View File

@ -107,7 +107,7 @@ function retry {
rc=0 rc=0
for i in $(seq $N); do for i in $(seq $N); do
echo "Trying: $*" echo "Trying: $*"
eval $@ && rc=$? || rc=$? eval $@; rc=$?
if [ $rc == 0 ]; then if [ $rc == 0 ]; then
break break
fi fi
@ -267,7 +267,7 @@ function start_s3fs {
if [ `uname` = "Darwin" ]; then if [ `uname` = "Darwin" ]; then
TRYCOUNT=0 TRYCOUNT=0
while [ $TRYCOUNT -le ${RETRIES:=20} ]; do while [ $TRYCOUNT -le ${RETRIES:=20} ]; do
df | grep -q $TEST_BUCKET_MOUNT_POINT_1 && rc=$? || rc=$? df | grep -q $TEST_BUCKET_MOUNT_POINT_1; rc=$?
if [ $rc -eq 0 ]; then if [ $rc -eq 0 ]; then
break; break;
fi fi

View File

@ -235,7 +235,7 @@ function run_suite {
key_prefix="testrun-$RANDOM" key_prefix="testrun-$RANDOM"
cd_run_dir $key_prefix cd_run_dir $key_prefix
for t in "${TEST_LIST[@]}"; do for t in "${TEST_LIST[@]}"; do
$t $key_prefix && rc=$? || rc=$? $t $key_prefix; rc=$?
if [[ $rc == 0 ]] ; then if [[ $rc == 0 ]] ; then
report_pass $t report_pass $t
else else