Commit 39fe5c84 authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

autotest_common: fix xtrace_restore_enable 



My previous patch enabling this to be called recursively didn't
take into account that a single call to xtrace_restore would
override multiple levels of xtrace_disable nesting. This change fixes
that.

fixes: 190b2245

Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Change-Id: I2167ba460e68223c9426b3d71e9c17019f947924
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478959


Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent fd73cb78

test/common/autotest_common.sh

+18 −2
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ function xtrace_disable() { 
			XTRACE_DISABLED="yes"

		fi

		set +x

        elif [ -z $XTRACE_NESTING_LEVEL ]; then

                XTRACE_NESTING_LEVEL=1

        else

                XTRACE_NESTING_LEVEL=$((++XTRACE_NESTING_LEVEL))

	fi

}
@@ -23,7 +27,17 @@ function xtrace_enable() { 
# Keep it as alias to avoid xtrace_enable backtrace always pointing to xtrace_restore.

# xtrace_enable will appear as called directly from the user script, from the same line

# that "called" xtrace_restore.

alias xtrace_restore='if [[ "$PREV_BASH_OPTS" == *"x"* ]]; then set -x; XTRACE_DISABLED="no"; PREV_BASH_OPTS=""; xtrace_enable; fi'

alias xtrace_restore=\

'if [ -z $XTRACE_NESTING_LEVEL ]; then

        if [[ "$PREV_BASH_OPTS" == *"x"* ]]; then

		XTRACE_DISABLED="no"; PREV_BASH_OPTS=""; set -x; xtrace_enable;

	fi

else

	XTRACE_NESTING_LEVEL=$((--XTRACE_NESTING_LEVEL));

	if [ $XTRACE_NESTING_LEVEL -eq "0" ]; then

		unset XTRACE_NESTING_LEVEL

	fi

fi'



: ${RUN_NIGHTLY:=0}

export RUN_NIGHTLY
@@ -950,7 +964,9 @@ trap "trap - ERR; print_backtrace >&2" ERR 


PS4=' \t	\$ '

if $SPDK_AUTOTEST_X; then

	# explicitly enable xtraces

	# explicitly enable xtraces, overriding any tracking information.

	unset XTRACE_DISABLED

	unset XTRACE_NESTING_LEVEL

	set -x

	xtrace_enable

else