ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autotest_common.sh: enable trace flag only if it was anabled before

Browse Source 
We are too verbose in many places. Some scripts don't want to be traced
all the way, instad they enable tracing only for some parts and
autotest_common.sh just do 'set -x' in many places.

This patch save 'x' flag on function enter and restore it at exit.

Change-Id: I39b3d3dd3f711e1131e476f9d322d9e1b097ad12
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/432604
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Pawel Wodkowski 2018-11-09 15:05:23 +01:00 committed by Ben Walker
parent 69f713ee5b
commit f751ea1723
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
test/common/autotest_common.sh
View File

@ -222,15 +222,17 @@ function timing() {
} }
function timing_enter() { function timing_enter() {
local shell_restore_x="$( [[ "$-" =~ x ]] && echo 'set -x' )"
set +x set +x
timing "enter" "$1" timing "enter" "$1"
set -x $shell_restore_x
} }
function timing_exit() { function timing_exit() {
local shell_restore_x="$( [[ "$-" =~ x ]] && echo 'set -x' )"
set +x set +x
timing "exit" "$1" timing "exit" "$1"
set -x $shell_restore_x
} }
function timing_finish() { function timing_finish() {
@ -304,17 +306,19 @@ function waitforlisten() {
exit 1 exit 1
fi fi
rpc_addr="${2:-$DEFAULT_RPC_ADDR}" local rpc_addr="${2:-$DEFAULT_RPC_ADDR}"
echo "Waiting for process to start up and listen on UNIX domain socket $rpc_addr..." echo "Waiting for process to start up and listen on UNIX domain socket $rpc_addr..."
# turn off trace for this loop # turn off trace for this loop
local shell_restore_x="$( [[ "$-" =~ x ]] && echo 'set -x' )"
set +x set +x
ret=1 local ret=0
while [ $ret -ne 0 ]; do while true; do
# if the process is no longer running, then exit the script # if the process is no longer running, then exit the script
# since it means the application crashed # since it means the application crashed
if ! kill -s 0 $1; then if ! kill -s 0 $1; then
exit 1 ret=1
break
fi fi
namespace=$(ip netns identify $1) namespace=$(ip netns identify $1)
@ -324,16 +328,20 @@ function waitforlisten() {
if hash ss; then if hash ss; then
if $ns_cmd ss -ln | egrep -q "\s+$rpc_addr\s+"; then if $ns_cmd ss -ln | egrep -q "\s+$rpc_addr\s+"; then
ret=0 break
fi fi
else else
# if system doesn't have ss, just assume it has netstat # if system doesn't have ss, just assume it has netstat
if $ns_cmd netstat -an | grep -iw LISTENING | egrep -q "\s+$rpc_addr\$"; then if $ns_cmd netstat -an | grep -iw LISTENING | egrep -q "\s+$rpc_addr\$"; then
ret=0 break
fi fi
fi fi
done done
set -x
$shell_restore_x
if [ $ret -ne 0 ]; then
exit 1
fi
} }
function waitfornbd() { function waitfornbd() {
@ -462,19 +470,20 @@ function kill_stub() {
} }
function run_test() { function run_test() {
local shell_restore_x="$( [[ "$-" =~ x ]] && echo 'set -x' )"
set +x set +x
local test_type="$(echo $1 | tr 'a-z' 'A-Z')" local test_type="$(echo $1 | tr 'a-z' 'A-Z')"
shift shift
echo "************************************" echo "************************************"
echo "START TEST $test_type $@" echo "START TEST $test_type $@"
echo "************************************" echo "************************************"
set -x $shell_restore_x
time "$@" time "$@"
set +x set +x
echo "************************************" echo "************************************"
echo "END TEST $test_type $@" echo "END TEST $test_type $@"
echo "************************************" echo "************************************"
set -x $shell_restore_x
} }
function print_backtrace() { function print_backtrace() {