From d29169bd77adf5107580288607ffb753e5fba7e7 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Wed, 4 Dec 2019 17:15:45 -0700 Subject: [PATCH] test/iscsi: convert data_digests tests to run_test We had very granular timing reporting on this test, but we really only had two test cases running for the whole thing. Change-Id: I11650e124e24e93b1f217c6b8efd2fb006284515 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476824 Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- test/iscsi_tgt/digests/digests.sh | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/test/iscsi_tgt/digests/digests.sh b/test/iscsi_tgt/digests/digests.sh index 15aab4d2a..14da79873 100755 --- a/test/iscsi_tgt/digests/digests.sh +++ b/test/iscsi_tgt/digests/digests.sh @@ -23,38 +23,26 @@ function node_login_fio_logout() { function iscsi_header_digest_test() { # Enable HeaderDigest to CRC32C - timing_enter HeaderDigest_enabled node_login_fio_logout "HeaderDigest -v CRC32C" - timing_exit HeaderDigest_enabled # Let iscsi target to decide its preference on # HeaderDigest based on its capability. - timing_enter preferred node_login_fio_logout "HeaderDigest -v CRC32C,None" - timing_exit preferred } function iscsi_header_data_digest_test() { # Only enable HeaderDigest to CRC32C - timing_enter HeaderDigest_enabled node_login_fio_logout "HeaderDigest -v CRC32C" "DataDigest -v None" - timing_exit HeaderDigest_enabled # Only enable DataDigest to CRC32C - timing_enter DataDigest_enabled node_login_fio_logout "HeaderDigest -v None" "DataDigest -v CRC32C" - timing_exit DataDigest_enabled # Let iscsi target to decide its preference on both # HeaderDigest and DataDigest based on its capability. - timing_enter both_preferred node_login_fio_logout "HeaderDigest -v CRC32C,None" "DataDigest -v CRC32C,None" - timing_exit both_preferred # Enable HeaderDigest and DataDigest both. - timing_enter both_enabled node_login_fio_logout "HeaderDigest -v CRC32C" "DataDigest -v CRC32C" - timing_exit both_enabled } MALLOC_BDEV_SIZE=64 @@ -94,9 +82,9 @@ iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT # Check and avoid setting DataDigest. DataDigestAbility=$(iscsiadm -m node -p $TARGET_IP:$ISCSI_PORT -o update -n node.conn[0].iscsi.DataDigest -v None 2>&1 || true) if [ "$DataDigestAbility"x != x ]; then - iscsi_header_digest_test + run_test "case" "iscsi_tgt_digest" iscsi_header_digest_test else - iscsi_header_data_digest_test + run_test "case" "iscsi_tgt_data_digest" iscsi_header_data_digest_test fi trap - SIGINT SIGTERM EXIT