From 6817babfa4e1247f802e1bab2860edc4773a2590 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Mon, 2 Mar 2020 10:24:08 +0100 Subject: [PATCH] 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: Karol Latecki Change-Id: I0eb186fe80b377f0c023774adf8ff321af7dfa81 Signed-off-by: Karol Latecki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1075 Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk Reviewed-by: Shuhei Matsumoto --- test/iscsi_tgt/calsoft/calsoft.sh | 5 ----- test/iscsi_tgt/iscsi_tgt.sh | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/iscsi_tgt/calsoft/calsoft.sh b/test/iscsi_tgt/calsoft/calsoft.sh index b2fe56703..048b529d5 100755 --- a/test/iscsi_tgt/calsoft/calsoft.sh +++ b/test/iscsi_tgt/calsoft/calsoft.sh @@ -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 diff --git a/test/iscsi_tgt/iscsi_tgt.sh b/test/iscsi_tgt/iscsi_tgt.sh index c898bd98e..11cff211d 100755 --- a/test/iscsi_tgt/iscsi_tgt.sh +++ b/test/iscsi_tgt/iscsi_tgt.sh @@ -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. - run_test "iscsi_tgt_calsoft" ./test/iscsi_tgt/calsoft/calsoft.sh + 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