Use $(...) notation for subshells in system tests
The changes were mostly done with sed: find . -name '*.sh' | xargs sed -i 's/`\([^`]*\)`/$(\1)/g' There have been a few manual changes where the regex wasn't sufficient (e.g. backslashes inside the `...`) or wrong (`...` referring to docs or in comments).
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
|
||||
set -x
|
||||
|
||||
PWD=`pwd`
|
||||
PWD=$(pwd)
|
||||
|
||||
KRB5_CONFIG="${PWD}/krb5.conf"
|
||||
export KRB5_CONFIG
|
||||
@@ -21,7 +21,7 @@ export KRB5_CONFIG
|
||||
KRB5_KDC_PROFILE=${PWD}/krb5kdc
|
||||
export KRB5_KDC_PROFILE
|
||||
|
||||
now=`date +%s`
|
||||
now=$(date +%s)
|
||||
lifetime=$((2147483647 - now))
|
||||
lifetime=$((lifetime / 3600 / 24 - 30))
|
||||
|
||||
|
||||
@@ -1313,7 +1313,7 @@ zone unreachable.
|
||||
update add unreachable. 600 A 192.0.2.1
|
||||
send
|
||||
END
|
||||
t2=`$PERL -e 'print time()'`
|
||||
t2=$($PERL -e 'print time()')
|
||||
grep "; Communication with 10.53.0.4#${PORT} failed: timed out" nsupdate.out.test$n > /dev/null 2>&1 || ret=1
|
||||
grep "not implemented" nsupdate.out.test$n > /dev/null 2>&1 && ret=1
|
||||
elapsed=$((t2 - t1))
|
||||
@@ -1332,7 +1332,7 @@ zone unreachable.
|
||||
update add unreachable. 600 A 192.0.2.1
|
||||
send
|
||||
END
|
||||
t2=`$PERL -e 'print time()'`
|
||||
t2=$($PERL -e 'print time()')
|
||||
grep "; Communication with 10.53.0.4#${PORT} failed: timed out" nsupdate.out.test$n > /dev/null 2>&1 || ret=1
|
||||
grep "not implemented" nsupdate.out.test$n > /dev/null 2>&1 && ret=1
|
||||
elapsed=$((t2 - t1))
|
||||
@@ -1351,7 +1351,7 @@ zone unreachable.
|
||||
update add unreachable. 600 A 192.0.2.1
|
||||
send
|
||||
END
|
||||
t2=`$PERL -e 'print time()'`
|
||||
t2=$($PERL -e 'print time()')
|
||||
grep "; Communication with 10.53.0.4#${PORT} failed: timed out" nsupdate.out.test$n > /dev/null 2>&1 || ret=1
|
||||
grep "not implemented" nsupdate.out.test$n > /dev/null 2>&1 && ret=1
|
||||
elapsed=$((t2 - t1))
|
||||
@@ -1370,7 +1370,7 @@ zone unreachable.
|
||||
update add unreachable. 600 A 192.0.2.1
|
||||
send
|
||||
END
|
||||
t2=`$PERL -e 'print time()'`
|
||||
t2=$($PERL -e 'print time()')
|
||||
grep "; Communication with 10.53.0.4#${PORT} failed: timed out" nsupdate.out.test$n > /dev/null 2>&1 || ret=1
|
||||
grep "not implemented" nsupdate.out.test$n > /dev/null 2>&1 && ret=1
|
||||
elapsed=$((t2 - t1))
|
||||
@@ -1389,7 +1389,7 @@ zone unreachable.
|
||||
update add unreachable. 600 A 192.0.2.1
|
||||
send
|
||||
END
|
||||
t2=`$PERL -e 'print time()'`
|
||||
t2=$($PERL -e 'print time()')
|
||||
grep "; Communication with 10.53.0.4#${PORT} failed: timed out" nsupdate.out.test$n > /dev/null 2>&1 || ret=1
|
||||
grep "not implemented" nsupdate.out.test$n > /dev/null 2>&1 && ret=1
|
||||
elapsed=$((t2 - t1))
|
||||
|
||||
Reference in New Issue
Block a user