Commit c2feee4f authored by Michal Berger's avatar Michal Berger Committed by Ben Walker
Browse files

test/common: Free stderr fd from tracing 



Consider this:

foo() { echo bar >&2 ; }
set -x
foobar=$(foo 2>&1)
[[ $foobar == "bar" ]]

The above test will fail since $foobar will also include tracing
strings as stderr is where set -x redirects the output. Since in
some cases this may troublesome, replace stderr with a dedicated
fd allocated dynamically.

Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Change-Id: Ia6609e4463b371c07fab42d2bd291c9e43742df5
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8158


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 70f7ea3e

test/common/autotest_common.sh

+12 −1
Original line number Diff line number Diff line 
#!/usr/bin/env bash



function xtrace_fd() {

	if [[ -n $BASH_XTRACEFD && -e /proc/self/fd/$BASH_XTRACEFD ]]; then

		# Close it first to make sure it's sane

		exec {BASH_XTRACEFD}>&-

	fi

	exec {BASH_XTRACEFD}>&2



	set -x

	echo "Tracing to $BASH_XTRACEFD FD"

}



function xtrace_disable() {

	if [ "$XTRACE_DISABLED" != "yes" ]; then

		PREV_BASH_OPTS="$-"
@@ -1388,7 +1399,7 @@ if $SPDK_AUTOTEST_X; then 
	# explicitly enable xtraces, overriding any tracking information.

	unset XTRACE_DISABLED

	unset XTRACE_NESTING_LEVEL

	set -x

	xtrace_fd

	xtrace_enable

else

	xtrace_restore