ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/iscsi_tgt: do not silently skip calsoft tests

Browse Source 
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: Karol Latecki <karol.latecki@intel.com>
Change-Id: I0eb186fe80b377f0c023774adf8ff321af7dfa81
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1075
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Karol Latecki 2020-03-02 10:24:08 +01:00 committed by Tomasz Zawadzki
parent 148719dad9
commit 6817babfa4
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/iscsi_tgt/calsoft/calsoft.sh
View File

@ -8,11 +8,6 @@ delete_tmp_conf_files() {
rm -f /usr/local/etc/its.conf 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_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512 MALLOC_BLOCK_SIZE=512

4
test/iscsi_tgt/iscsi_tgt.sh
View File

@ -27,7 +27,11 @@ if [ "$TEST_TYPE" == "posix" ]; then
# calsoft doesn't handle TCP stream properly and fails decoding iSCSI # calsoft doesn't handle TCP stream properly and fails decoding iSCSI
# requests when are divided by TCP segmentation. This is very common # requests when are divided by TCP segmentation. This is very common
# situation for VPP and causes that calsoft.sh never PASS. # 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 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 fi
run_test "iscsi_tgt_filesystem" ./test/iscsi_tgt/filesystem/filesystem.sh run_test "iscsi_tgt_filesystem" ./test/iscsi_tgt/filesystem/filesystem.sh
run_test "iscsi_tgt_reset" ./test/iscsi_tgt/reset/reset.sh run_test "iscsi_tgt_reset" ./test/iscsi_tgt/reset/reset.sh