Changed $(command) to command in tests.sh for compatibility with

older bourne shells.
This commit is contained in:
Evan Hunt
2010-12-20 18:37:07 +00:00
parent 72cfc80dab
commit 8fda09fc85
2 changed files with 8 additions and 6 deletions

View File

@@ -25,8 +25,9 @@ EOF
return 1
}
out="$($DIG $DIGOPTS -t $type -q $host | egrep ^$host)"
[ $(echo "$out" | grep "$digout" | wc -l) -eq 1 ] || {
out=`$DIG $DIGOPTS -t $type -q $host | egrep ^$host`
lines=`echo "$out" | grep "$digout" | wc -l`
[ $lines -eq 1 ] || {
echo "I:dig output incorrect for $host $type $cmd: $out"
return 1
}

View File

@@ -28,8 +28,9 @@ EOF
return 1
}
out="$($DIG $DIGOPTS -t $type -q $host | egrep ^$host)"
[ $(echo "$out" | grep "$digout" | wc -l) -eq 1 ] || {
out=`$DIG $DIGOPTS -t $type -q $host | egrep ^$host`
lines=`echo "$out" | grep "$digout" | wc -l`
[ $lines -eq 1 ] || {
echo "I:dig output incorrect for $host $type $cmd: $out"
return 1
}
@@ -37,7 +38,7 @@ EOF
}
echo "I:testing updates as administrator"
KRB5CCNAME=$(pwd)/ns1/administrator.ccache
KRB5CCNAME=`pwd`/ns1/administrator.ccache
export KRB5CCNAME
test_update testdc1.example.nil. A "86400 A 10.53.0.10" "10.53.0.10" || status=1
@@ -45,7 +46,7 @@ test_update testdc2.example.nil. A "86400 A 10.53.0.11" "10.53.0.11" || status=1
test_update denied.example.nil. TXT "86400 TXT helloworld" "helloworld" && status=1
echo "I:testing updates as a user"
KRB5CCNAME=$(pwd)/ns1/testdenied.ccache
KRB5CCNAME=`pwd`/ns1/testdenied.ccache
export KRB5CCNAME
test_update testdenied.example.nil. A "86400 A 10.53.0.12" "10.53.0.12" && status=1