Commit 6817babf authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

test/iscsi_tgt: do not silently skip calsoft tests 



Remove if/exit steps from calsoft.sh and move the condition
to parent script iscsi_tgt.sh. This still to run iscsi_tgt.sh
on systems which don't have Calsoft installed but still allows
CI to detect missed tests thanks to autorun_post.py.

Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Change-Id: I0eb186fe80b377f0c023774adf8ff321af7dfa81
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1075


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 148719da

test/iscsi_tgt/calsoft/calsoft.sh

+0 −5
Original line number Diff line number Diff line
@@ -8,11 +8,6 @@ delete_tmp_conf_files() { 
	rm -f /usr/local/etc/its.conf

}



if [ ! -d /usr/local/calsoft ]; then

	echo "skipping calsoft tests"

	exit 0

fi



MALLOC_BDEV_SIZE=64

MALLOC_BLOCK_SIZE=512

test/iscsi_tgt/iscsi_tgt.sh

+5 −1
Original line number Diff line number Diff line
@@ -27,7 +27,11 @@ if [ "$TEST_TYPE" == "posix" ]; then 
	# calsoft doesn't handle TCP stream properly and fails decoding iSCSI

	# requests when are divided by TCP segmentation. This is very common

	# situation for VPP and causes that calsoft.sh never PASS.

	if [[ -d /usr/local/calsoft ]]; then

		run_test "iscsi_tgt_calsoft" ./test/iscsi_tgt/calsoft/calsoft.sh

	else

		skip_run_test_with_warning "WARNING: Calsoft binaries not found, skipping test!"

	fi

fi

run_test "iscsi_tgt_filesystem" ./test/iscsi_tgt/filesystem/filesystem.sh

run_test "iscsi_tgt_reset" ./test/iscsi_tgt/reset/reset.sh