Change the way arithmetic operations are performed in system test shell
scripts from using `expr` to `$(())`. This ensures that updating the
variable won't end up with a non-zero exit code, which would case the
script to exit prematurely when `set -e` is in effect.
The following replacements were performed using sed in all text files
(git grep -Il '' | xargs sed -i):
s/status=`expr $status + $ret`/status=$((status + ret))/g
s/n=`expr $n + 1`/n=$((n + 1))/g
s/t=`expr $t + 1`/t=$((t + 1))/g
s/status=`expr $status + 1`/status=$((status + 1))/g
s/try=`expr $try + 1`/try=$((try + 1))/g
(manually picked from commit 4d42bdc245)
49 lines
1.3 KiB
Bash
49 lines
1.3 KiB
Bash
#!/bin/sh
|
|
|
|
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
|
#
|
|
# SPDX-License-Identifier: MPL-2.0
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, you can obtain one at https://mozilla.org/MPL/2.0/.
|
|
#
|
|
# See the COPYRIGHT file distributed with this work for additional
|
|
# information regarding copyright ownership.
|
|
|
|
set -e
|
|
|
|
. ../conf.sh
|
|
|
|
status=0
|
|
|
|
echo_i "test name too long"
|
|
$PERL formerr.pl -a 10.53.0.1 -p ${PORT} nametoolong > nametoolong.out
|
|
ans=`grep got: nametoolong.out`
|
|
if [ "${ans}" != "got: 000080010000000000000000" ];
|
|
then
|
|
echo_i "failed"; status=$((status + 1));
|
|
fi
|
|
|
|
echo_i "two questions"
|
|
$PERL formerr.pl -a 10.53.0.1 -p ${PORT} twoquestions > twoquestions.out
|
|
ans=`grep got: twoquestions.out`
|
|
if [ "${ans}" != "got: 000080010000000000000000" ];
|
|
then
|
|
echo_i "failed"; status=$((status + 1));
|
|
fi
|
|
|
|
# this would be NOERROR if it included a COOKIE option,
|
|
# but is a FORMERR without one.
|
|
echo_i "empty question section (and no COOKIE option)"
|
|
$PERL formerr.pl -a 10.53.0.1 -p ${PORT} noquestions > noquestions.out
|
|
ans=`grep got: noquestions.out`
|
|
if [ "${ans}" != "got: 000080010000000000000000" ];
|
|
then
|
|
echo_i "failed"; status=$((status + 1));
|
|
fi
|
|
|
|
echo_i "exit status: $status"
|
|
|
|
[ $status -eq 0 ] || exit 1
|