ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch 'wpk-get-rid-of-bashism-in-CDS-test' into 'master'

Browse Source 
Small system tests fixes for Solaris

See merge request isc-projects/bind9!988
This commit is contained in:
Mark Andrews
2018-11-07 19:41:30 -05:00
parent 3317d3d2bb 82dfb77328
commit 8e292b3262
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/system/autosign/tests.sh
View File

@@ -236,7 +236,7 @@ status=`expr $status + $ret`
echo_i "checking for nsec3param signing record ($n)"
ret=0
$RNDCCMD 10.53.0.3 signing -list autonsec3.example. > signing.out.test$n 2>&1 | sed 's/^/ns3 /' | cat_i
$RNDCCMD 10.53.0.3 signing -list autonsec3.example. > signing.out.test$n 2>&1
grep "Pending NSEC3 chain 1 0 20 DEAF" signing.out.test$n > /dev/null || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi

3
bin/tests/system/cds/setup.sh
View File

@@ -42,7 +42,8 @@ tac() {
}
convert() {
local key=$1 n=$2
key=$1
n=$2
$DSFROMKEY $key >DS.$n
grep ' 8 1 ' DS.$n >DS.$n-1
grep ' 8 2 ' DS.$n >DS.$n-2

12
bin/tests/system/conf.sh.in
View File

@@ -226,20 +226,20 @@ fi
SYSTESTDIR="`basename $PWD`"
echo_i() {
echo "$@" | while read LINE ; do
echoinfo "I:$SYSTESTDIR:$LINE"
echo "$@" | while read __LINE ; do
echoinfo "I:$SYSTESTDIR:$__LINE"
done
}
echo_ic() {
echo "$@" | while read LINE ; do
echoinfo "I:$SYSTESTDIR: $LINE"
echo "$@" | while read __LINE ; do
echoinfo "I:$SYSTESTDIR: $__LINE"
done
}
cat_i() {
while read LINE ; do
echoinfo "I:$SYSTESTDIR:$LINE"
while read __LINE ; do
echoinfo "I:$SYSTESTDIR:$__LINE"
done
}

12
bin/tests/system/conf.sh.win32
View File

@@ -203,20 +203,20 @@ echoend () {
SYSTESTDIR="`basename $PWD`"
echo_i() {
echo "$@" | while read LINE ; do
echoinfo "I:$SYSTESTDIR:$LINE"
echo "$@" | while read __LINE ; do
echoinfo "I:$SYSTESTDIR:$__LINE"
done
}
echo_ic() {
echo "$@" | while read LINE ; do
echoinfo "I:$SYSTESTDIR: $LINE"
echo "$@" | while read __LINE ; do
echoinfo "I:$SYSTESTDIR: $__LINE"
done
}
cat_i() {
while read LINE ; do
echoinfo "I:$SYSTESTDIR:$LINE"
while read __LINE ; do
echoinfo "I:$SYSTESTDIR:$__LINE"
done
}