Commit 6f3127ad authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

test/spdkcli: Adjust traps 



Mainly, don't trigger them on ERR, simply on EXIT - the ERR is
reserved for the main tracing trap set by autotest_common.sh and it
should not be overwritten.

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


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent fe648cb9

test/spdkcli/common.sh

+1 −4
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ 
spdkcli_job="$rootdir/test/spdkcli/spdkcli_job.py"

spdk_clear_config_py="$rootdir/test/json_config/clear_config.py"



function on_error_exit() {

	set +e

function cleanup() {

	if [ -n "$spdk_tgt_pid" ]; then

		killprocess $spdk_tgt_pid

	fi
@@ -21,8 +20,6 @@ function on_error_exit() { 
		killprocess $vhost_tgt_pid

	fi

	rm -f $testdir/${MATCH_FILE} $testdir/match_files/spdkcli_details_vhost.test /tmp/sample_aio /tmp/sample_pmem

	print_backtrace

	exit 1

}



function run_spdk_tgt() {

test/spdkcli/iscsi.sh

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ source $rootdir/test/iscsi_tgt/common.sh 
MATCH_FILE="spdkcli_iscsi.test"

SPDKCLI_BRANCH="/iscsi"



trap 'on_error_exit;' ERR

trap 'cleanup' EXIT



timing_enter run_iscsi_tgt

test/spdkcli/nvmf.sh

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ source $rootdir/test/nvmf/common.sh 
MATCH_FILE="spdkcli_nvmf.test"

SPDKCLI_BRANCH="/nvmf"



trap 'on_error_exit' ERR

trap 'cleanup' EXIT



timing_enter run_nvmf_tgt

run_nvmf_tgt

test/spdkcli/pmem.sh

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ source $rootdir/test/spdkcli/common.sh 
MATCH_FILE="spdkcli_pmem.test"

SPDKCLI_BRANCH="/bdevs/pmemblk"



trap 'rm -f $testdir/match_files/spdkcli_pmem_info.test; on_error_exit;' ERR

trap 'rm -f $testdir/match_files/spdkcli_pmem_info.test; cleanup' EXIT



timing_enter run_spdk_tgt

run_spdk_tgt

test/spdkcli/raid.sh

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ SPDKCLI_BRANCH="/bdevs" 
testdir=$(readlink -f $(dirname $0))

. $testdir/common.sh



trap 'on_error_exit;' ERR

trap 'cleanup' EXIT



timing_enter run_spdk_tgt

run_spdk_tgt