From dbf2e7928eadd54031e0cc213e6b148cbf3ff350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Witold=20Kr=C4=99cicki?= Date: Tue, 6 Nov 2018 13:43:09 +0000 Subject: [PATCH 1/3] Get rid of bashism in CDS test --- bin/tests/system/cds/setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/tests/system/cds/setup.sh b/bin/tests/system/cds/setup.sh index da4a41221f..6aafe92ccf 100644 --- a/bin/tests/system/cds/setup.sh +++ b/bin/tests/system/cds/setup.sh @@ -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 From 0949b1fe2c5f4b116f19f18428d5d70bf929b4d3 Mon Sep 17 00:00:00 2001 From: Witold Krecicki Date: Wed, 7 Nov 2018 23:15:06 +0100 Subject: [PATCH 2/3] Use 'local' variable in echo functions in tests --- bin/tests/system/conf.sh.in | 12 ++++++------ bin/tests/system/conf.sh.win32 | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index 717bef14b8..212897e54f 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -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 } diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32 index 4adaff0bc6..b8010f5430 100644 --- a/bin/tests/system/conf.sh.win32 +++ b/bin/tests/system/conf.sh.win32 @@ -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 } From 82dfb7732856ebdc0120e707a4fd960ee78a756d Mon Sep 17 00:00:00 2001 From: Witold Krecicki Date: Thu, 8 Nov 2018 00:07:00 +0100 Subject: [PATCH 3/3] Remove unnecessary sed from autosign test --- bin/tests/system/autosign/tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh index 7cc4bb4851..53805a98d7 100755 --- a/bin/tests/system/autosign/tests.sh +++ b/bin/tests/system/autosign/tests.sh @@ -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