test/iscsi_tgt: enable --iso mode for calsoft.sh
Test scripts need to call iscsitestinit to enable --iso mode - so call it from calsoft.sh like we do for other test scripts. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: Ibdf1789f76d75ff3dfd317c333524337d34c579c Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15971 Reviewed-by: Michal Berger <michal.berger@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
parent
1efd574527
commit
1aa807f44c
@ -27,11 +27,13 @@ echo "IP=$TARGET_IP" >> /usr/local/etc/its.conf
|
|||||||
|
|
||||||
timing_enter start_iscsi_tgt
|
timing_enter start_iscsi_tgt
|
||||||
|
|
||||||
|
iscsitestinit
|
||||||
|
|
||||||
"${ISCSI_APP[@]}" -m 0x1 --wait-for-rpc &
|
"${ISCSI_APP[@]}" -m 0x1 --wait-for-rpc &
|
||||||
pid=$!
|
pid=$!
|
||||||
echo "Process pid: $pid"
|
echo "Process pid: $pid"
|
||||||
|
|
||||||
trap 'killprocess $pid; delete_tmp_conf_files; exit 1 ' SIGINT SIGTERM EXIT
|
trap 'killprocess $pid; delete_tmp_conf_files; iscsitestfini; exit 1 ' SIGINT SIGTERM EXIT
|
||||||
|
|
||||||
waitforlisten $pid
|
waitforlisten $pid
|
||||||
$rpc_py load_subsystem_config < $testdir/iscsi.json
|
$rpc_py load_subsystem_config < $testdir/iscsi.json
|
||||||
@ -62,6 +64,8 @@ fi
|
|||||||
|
|
||||||
trap - SIGINT SIGTERM EXIT
|
trap - SIGINT SIGTERM EXIT
|
||||||
|
|
||||||
|
iscsicleanup
|
||||||
killprocess $pid
|
killprocess $pid
|
||||||
delete_tmp_conf_files
|
delete_tmp_conf_files
|
||||||
|
iscsitestfini
|
||||||
exit $failed
|
exit $failed
|
||||||
|
Loading…
Reference in New Issue
Block a user