mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

Use $() instead of backticks

Browse Source
This commit is contained in:
Mark Andrews
2023-07-28 05:24:01 +10:00
parent 6d0f19da7d
commit 162db75e2b
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bin/tests/system/conf.sh.common
View File

@@ -129,13 +129,13 @@ zonechecks"
# Set up color-coded test output # Set up color-coded test output
# #
if [ ${SYSTEMTEST_FORCE_COLOR:-0} -eq 1 ] || test -t 1 && type tput > /dev/null 2>&1 && tput setaf 7 > /dev/null 2>&1 ; then if [ ${SYSTEMTEST_FORCE_COLOR:-0} -eq 1 ] || test -t 1 && type tput > /dev/null 2>&1 && tput setaf 7 > /dev/null 2>&1 ; then
export COLOR_END=`tput setaf 4` # blue export COLOR_END=$(tput setaf 4) # blue
export COLOR_FAIL=`tput setaf 1` # red export COLOR_FAIL=$(tput setaf 1) # red
export COLOR_INFO=`tput bold` # bold export COLOR_INFO=$(tput bold) # bold
export COLOR_NONE=`tput sgr0` export COLOR_NONE=$(tput sgr0)
export COLOR_PASS=`tput setaf 2` # green export COLOR_PASS=$(tput setaf 2) # green
export COLOR_START=`tput setaf 4` # blue export COLOR_START=$(tput setaf 4) # blue
export COLOR_WARN=`tput setaf 3` # yellow export COLOR_WARN=$(tput setaf 3) # yellow
else else
# set to empty strings so printf succeeds # set to empty strings so printf succeeds
export COLOR_END='' export COLOR_END=''
@@ -147,7 +147,7 @@ else
export COLOR_WARN='' export COLOR_WARN=''
fi fi
export SYSTESTDIR="`basename $PWD`" export SYSTESTDIR="$(basename $PWD)"
if type printf > /dev/null 2>&1 if type printf > /dev/null 2>&1
then then
@@ -238,7 +238,7 @@ cat_d() {
} }
digcomp() { digcomp() {
{ output=`$PERL $TOP_SRCDIR/bin/tests/system/digcomp.pl "$@"`; result=$?; } || true { output=$($PERL $TOP_SRCDIR/bin/tests/system/digcomp.pl "$@"); result=$?; } || true
[ -n "$output" ] && { echo "digcomp failed:"; echo "$output"; } | cat_i [ -n "$output" ] && { echo "digcomp failed:"; echo "$output"; } | cat_i
return $result return $result
} }
@@ -472,7 +472,7 @@ nextpartreset() {
# total number of lines read from that file so far to file descriptor 3 # total number of lines read from that file so far to file descriptor 3
nextpartread() { nextpartread() {
[ -f $1.prev ] || nextpartreset $1 [ -f $1.prev ] || nextpartreset $1
prev=`cat $1.prev` prev=$(cat $1.prev)
awk "NR > $prev "'{ print } awk "NR > $prev "'{ print }
END { print NR > "/dev/stderr" }' $1 2>&3 END { print NR > "/dev/stderr" }' $1 2>&3
} }
@@ -678,8 +678,8 @@ get_dig_xfer_stats() {
# them to a format used by some system tests. # them to a format used by some system tests.
get_named_xfer_stats() { get_named_xfer_stats() {
LOGFILE="$1" LOGFILE="$1"
PEER="`echo $2 | sed 's/\./\\\\./g'`" PEER="$(echo $2 | sed 's/\./\\./g')"
ZONE="`echo $3 | sed 's/\./\\\\./g'`" ZONE="$(echo $3 | sed 's/\./\\./g')"
MESSAGE="$4" MESSAGE="$4"
grep " ${PEER}#.*${MESSAGE}:" "${LOGFILE}" | \ grep " ${PEER}#.*${MESSAGE}:" "${LOGFILE}" | \
sed -n "s/.* '${ZONE}\/.* \([0-9][0-9]*\) messages.*/messages=\1/p" | tail -1 sed -n "s/.* '${ZONE}\/.* \([0-9][0-9]*\) messages.*/messages=\1/p" | tail -1