This patch refactors most of unit tests to be contained in one
combined array, and run depending on the PMD capabilities instead of
providing multiple array with tests for individual PMDs.
Only a subset of unit tests was merged into one array - it combines
all tests originally meant to be run on these PMDs:
null, aesni_mb, aesni_gcm, openssl, qat, sw_snow3g, sw_kasumi, sw_zuc.

Signed-off-by: Adam Dybkowski <adamx.dybkow...@intel.com>
---
 app/test/test_cryptodev.c                  | 1131 +++++---------------
 app/test/test_cryptodev_blockcipher.c      |    2 +-
 app/test/test_cryptodev_des_test_vectors.h |    6 +-
 3 files changed, 243 insertions(+), 896 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 8bb27c3b9..1750f6fce 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -5071,11 +5071,9 @@ test_zuc_auth_cipher(const struct wireless_test_data 
*tdata,
 
        uint64_t feat_flags = dev_info.feature_flags;
 
-       if (op_mode == OUT_OF_PLACE) {
-               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
-                       printf("Device doesn't support digest encrypted.\n");
-                       return -ENOTSUP;
-               }
+       if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+               printf("Device doesn't support digest encrypted.\n");
+               return -ENOTSUP;
        }
 
        /* Create ZUC session */
@@ -6060,11 +6058,9 @@ test_mixed_auth_cipher(const struct 
mixed_cipher_auth_test_data *tdata,
 
        uint64_t feat_flags = dev_info.feature_flags;
 
-       if (op_mode == OUT_OF_PLACE) {
-               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
-                       printf("Device doesn't support digest encrypted.\n");
-                       return -ENOTSUP;
-               }
+       if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+               printf("Device doesn't support digest encrypted.\n");
+               return -ENOTSUP;
        }
 
        /* Create the session */
@@ -11536,8 +11532,8 @@ static struct unit_test_suite 
cryptodev_scheduler_testsuite  = {
 
 #endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */
 
-static struct unit_test_suite cryptodev_qat_testsuite  = {
-       .suite_name = "Crypto QAT Unit Test Suite",
+static struct unit_test_suite cryptodev_testsuite  = {
+       .suite_name = "Crypto Unit Test Suite",
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
@@ -11547,8 +11543,15 @@ static struct unit_test_suite cryptodev_qat_testsuite  
= {
                                test_device_configure_invalid_queue_pair_ids),
                TEST_CASE_ST(ut_setup, ut_teardown,
                                test_queue_pair_descriptor_setup),
+
                TEST_CASE_ST(ut_setup, ut_teardown,
                                test_multi_session),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_multi_session_random_usage),
+
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_null_invalid_operation),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_null_burst_operation),
 
                TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
                TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
@@ -11576,9 +11579,43 @@ static struct unit_test_suite cryptodev_qat_testsuite  
= {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_CCM_authenticated_decryption_test_case_128_3),
 
+               /** AES CCM Authenticated Encryption 192 bits key */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_192_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_192_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_192_3),
+
+               /** AES CCM Authenticated Decryption 192 bits key*/
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_192_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_192_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_192_3),
+
+               /** AES CCM Authenticated Encryption 256 bits key */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_256_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_256_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_256_3),
+
+               /** AES CCM Authenticated Decryption 256 bits key*/
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_256_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_256_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_256_3),
+
                /** AES GCM Authenticated Encryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -11684,6 +11721,30 @@ static struct unit_test_suite cryptodev_qat_testsuite  
= {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_auth_decryption_test_case_256_7),
 
+               /** AES GCM Authenticated Encryption big aad size */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encryption_test_case_aad_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encryption_test_case_aad_2),
+
+               /** AES GCM Authenticated Decryption big aad size */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_decryption_test_case_aad_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_decryption_test_case_aad_2),
+
+               /** Out of place tests */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
+
+               /** Session-less tests */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       
test_AES_GCM_authenticated_encryption_sessionless_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       
test_AES_GCM_authenticated_decryption_sessionless_test_case_1),
+
                /** AES GMAC Authentication */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GMAC_authentication_test_case_1),
@@ -11697,6 +11758,10 @@ static struct unit_test_suite cryptodev_qat_testsuite  
= {
                        test_AES_GMAC_authentication_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GMAC_authentication_verify_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_verify_test_case_4),
 
                /** SNOW 3G encrypt only (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -11712,6 +11777,10 @@ static struct unit_test_suite cryptodev_qat_testsuite  
= {
 
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_encryption_test_case_1_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_1_oop_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_1_offset_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_decryption_test_case_1_oop),
 
@@ -11774,12 +11843,26 @@ static struct unit_test_suite cryptodev_qat_testsuite 
 = {
                        test_snow3g_hash_generate_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_generate_test_case_3),
+               /* Tests with buffers which length is not byte-aligned */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_verify_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_verify_test_case_3),
+               /* Tests with buffers which length is not byte-aligned */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_cipher_auth_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -11796,8 +11879,20 @@ static struct unit_test_suite cryptodev_qat_testsuite  
= {
                        test_zuc_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_zuc_encryption_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_encryption_test_case_6_sgl),
 
                /** ZUC authenticate (EIA3) */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_zuc_hash_generate_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -11841,11 +11936,7 @@ static struct unit_test_suite cryptodev_qat_testsuite  
= {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_MD5_HMAC_verify_case_2),
 
-               /** NULL algo tests done in chain_all,
-                * cipheronly and authonly suites
-                */
-
-               /** KASUMI tests */
+               /** KASUMI hash only (UIA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_kasumi_hash_generate_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -11870,10 +11961,38 @@ static struct unit_test_suite cryptodev_qat_testsuite 
 = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_kasumi_hash_verify_test_case_5),
 
+               /** KASUMI encrypt only (UEA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_kasumi_encryption_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_1_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_1_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_1_oop_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_kasumi_encryption_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_5),
+
+               /** KASUMI decrypt only (UEA1) */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_decryption_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_decryption_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_decryption_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_decryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_decryption_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_decryption_test_case_1_oop),
+
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_kasumi_cipher_auth_test_case_1),
 
@@ -11901,6 +12020,12 @@ static struct unit_test_suite cryptodev_qat_testsuite  
= {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_kasumi_auth_cipher_verify_test_case_2_oop_sgl),
 
+               /** ESN Testcase */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       auth_encrypt_AES128CBC_HMAC_SHA1_esn_check),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       auth_decrypt_AES128CBC_HMAC_SHA1_esn_check),
+
                /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        authentication_verify_HMAC_SHA1_fail_data_corrupt),
@@ -12035,12 +12160,73 @@ static struct unit_test_suite 
cryptodev_virtio_testsuite = {
        }
 };
 
-static struct unit_test_suite cryptodev_aesni_mb_testsuite  = {
-       .suite_name = "Crypto Device AESNI MB Unit Test Suite",
+static struct unit_test_suite cryptodev_caam_jr_testsuite  = {
+       .suite_name = "Crypto CAAM JR Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                            test_device_configure_invalid_dev_id),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                            test_multi_session),
+
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+static struct unit_test_suite cryptodev_dpaa_sec_testsuite  = {
+       .suite_name = "Crypto DPAA_SEC Unit Test Suite",
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 51, 0)
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                            test_device_configure_invalid_dev_id),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                            test_multi_session),
+
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+
+#ifdef RTE_LIBRTE_SECURITY
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_PDCP_PROTO_cplane_encap_all),
+
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_PDCP_PROTO_cplane_decap_all),
+
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_PDCP_PROTO_uplane_encap_all),
+
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_PDCP_PROTO_uplane_decap_all),
+
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_PDCP_PROTO_SGL_in_place_32B),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_PDCP_PROTO_SGL_oop_32B_128B),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_PDCP_PROTO_SGL_oop_32B_40B),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_PDCP_PROTO_SGL_oop_128B_32B),
+#endif
+               /** AES GCM Authenticated Encryption */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12055,6 +12241,8 @@ static struct unit_test_suite 
cryptodev_aesni_mb_testsuite  = {
                        test_AES_GCM_authenticated_encryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_encryption_test_case_7),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_encryption_test_case_8),
 
                /** AES GCM Authenticated Decryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12071,6 +12259,8 @@ static struct unit_test_suite 
cryptodev_aesni_mb_testsuite  = {
                        test_AES_GCM_authenticated_decryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_decryption_test_case_7),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_decryption_test_case_8),
 
                /** AES GCM Authenticated Encryption 192 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12136,866 +12326,42 @@ static struct unit_test_suite 
cryptodev_aesni_mb_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_auth_decryption_test_case_256_7),
 
-               /** AES GCM Authenticated Encryption big aad size */
+               /** Out of place tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_aad_1),
+                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_aad_2),
+                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
 
-               /** AES GCM Authenticated Decryption big aad size */
+               /** SNOW 3G encrypt only (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_aad_1),
+                       test_snow3g_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_aad_2),
-
-               /** Session-less tests */
+                       test_snow3g_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       
test_AES_GCM_authenticated_encryption_sessionless_test_case_1),
+                       test_snow3g_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       
test_AES_GCM_authenticated_decryption_sessionless_test_case_1),
+                       test_snow3g_encryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_5),
 
-               /** AES GMAC Authentication */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_1),
+                       test_snow3g_encryption_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_1),
+                               test_snow3g_encryption_test_case_1_oop_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_2),
+                       test_snow3g_decryption_test_case_1_oop),
+
+               /** SNOW 3G decrypt only (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_2),
+                       test_snow3g_decryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_3),
+                       test_snow3g_decryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_3),
-#endif /* IMB_VERSION_NUM >= IMB_VERSION(0, 51, 0) */
-
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_docsis_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_DES_docsis_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_3),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_openssl_testsuite  = {
-       .suite_name = "Crypto Device OPENSSL Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_multi_session),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_multi_session_random_usage),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_DES_docsis_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-
-               /** AES GCM Authenticated Encryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
-
-               /** AES GCM Authenticated Decryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
-
-
-               /** AES GCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_7),
-
-               /** AES GCM Authenticated Decryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_7),
-
-               /** AES GCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
-
-               /** AES GCM Authenticated Decryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_7),
-
-               /** AES GMAC Authentication */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_4),
-
-               /** AES CCM Authenticated Encryption 128 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_3),
-
-               /** AES CCM Authenticated Decryption 128 bits key*/
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_3),
-
-               /** AES CCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_3),
-
-               /** AES CCM Authenticated Decryption 192 bits key*/
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_3),
-
-               /** AES CCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_3),
-
-               /** AES CCM Authenticated Decryption 256 bits key*/
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_3),
-
-               /** Scatter-Gather */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
-
-               /** Negative tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
-
-               /* ESN Testcase */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_encrypt_AES128CBC_HMAC_SHA1_esn_check),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decrypt_AES128CBC_HMAC_SHA1_esn_check),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_aesni_gcm_testsuite  = {
-       .suite_name = "Crypto Device AESNI GCM Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               /** AES GCM Authenticated Encryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
-
-               /** AES GCM Authenticated Decryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
-
-               /** AES GCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_7),
-
-               /** AES GCM Authenticated Decryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_7),
-
-               /** AES GCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
-
-               /** AES GCM Authenticated Decryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_7),
-
-               /** AES GCM Authenticated Encryption big aad size */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_aad_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_aad_2),
-
-               /** AES GCM Authenticated Decryption big aad size */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_aad_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_aad_2),
-
-               /** AES GMAC Authentication */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_4),
-
-               /** Negative tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
-
-               /** Out of place tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
-
-               /** Session-less tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       
test_AES_GCM_authenticated_encryption_sessionless_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       
test_AES_GCM_authenticated_decryption_sessionless_test_case_1),
-
-               /** Scatter-Gather */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_sw_kasumi_testsuite  = {
-       .suite_name = "Crypto Device SW KASUMI Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               /** KASUMI encrypt only (UEA1) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_5),
-               /** KASUMI decrypt only (UEA1) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_5),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop_sgl),
-
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1_oop),
-
-               /** KASUMI hash only (UIA1) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_cipher_auth_test_case_1),
-
-               /** KASUMI generate auth, then encrypt (F8) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_oop_sgl),
-
-               /** KASUMI decrypt (F8), then verify auth */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_oop_sgl),
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-static struct unit_test_suite cryptodev_sw_snow3g_testsuite  = {
-       .suite_name = "Crypto Device SW SNOW 3G Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               /** SNOW 3G encrypt only (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_with_digest_test_case_1),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_snow3g_encryption_test_case_1_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_offset_oop),
-
-               /** SNOW 3G decrypt only (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_with_digest_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_3),
-               /* Tests with buffers which length is not byte-aligned */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_3),
-               /* Tests with buffers which length is not byte-aligned */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_cipher_auth_test_case_1),
-
-               /** SNOW 3G generate auth, then encrypt (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_3_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_3_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_oop_sgl),
-
-               /** SNOW 3G decrypt (UEA2), then verify auth */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_3_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_3_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_oop_sgl),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_sw_zuc_testsuite  = {
-       .suite_name = "Crypto Device SW ZUC Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               /** ZUC encrypt only (EEA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_6_sgl),
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_caam_jr_testsuite  = {
-       .suite_name = "Crypto CAAM JR Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_device_configure_invalid_dev_id),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_multi_session),
-
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_dpaa_sec_testsuite  = {
-       .suite_name = "Crypto DPAA_SEC Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_device_configure_invalid_dev_id),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_multi_session),
-
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-
-#ifdef RTE_LIBRTE_SECURITY
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_encap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_decap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_encap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_decap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_in_place_32B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_128B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_40B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_128B_32B),
-#endif
-               /** AES GCM Authenticated Encryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_8),
-
-               /** AES GCM Authenticated Decryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_8),
-
-               /** AES GCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_7),
-
-               /** AES GCM Authenticated Decryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_7),
-
-               /** AES GCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
-
-               /** AES GCM Authenticated Decryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_7),
-
-               /** Out of place tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
-
-               /** SNOW 3G encrypt only (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_5),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_snow3g_encryption_test_case_1_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
-
-               /** SNOW 3G decrypt only (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_5),
+                       test_snow3g_decryption_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_test_case_5),
 
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_generate_test_case_1),
@@ -13344,23 +12710,6 @@ static struct unit_test_suite 
cryptodev_dpaa2_sec_testsuite  = {
        }
 };
 
-static struct unit_test_suite cryptodev_null_testsuite  = {
-       .suite_name = "Crypto Device NULL Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_invalid_operation),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_burst_operation),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
 static struct unit_test_suite cryptodev_armv8_testsuite  = {
        .suite_name = "Crypto Device ARMv8 Unit Test Suite",
        .setup = testsuite_setup,
@@ -13876,7 +13225,7 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc 
__rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_qat_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -13908,7 +13257,7 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int 
argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_aesni_mb_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -13924,7 +13273,7 @@ test_cryptodev_openssl(void)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_openssl_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -13940,7 +13289,7 @@ test_cryptodev_aesni_gcm(void)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_aesni_gcm_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -13956,7 +13305,7 @@ test_cryptodev_null(void)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_null_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -13972,7 +13321,7 @@ test_cryptodev_sw_snow3g(void /*argv __rte_unused, int 
argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_sw_snow3g_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -13988,7 +13337,7 @@ test_cryptodev_sw_kasumi(void /*argv __rte_unused, int 
argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_sw_kasumi_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -14004,7 +13353,7 @@ test_cryptodev_sw_zuc(void /*argv __rte_unused, int 
argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_sw_zuc_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
diff --git a/app/test/test_cryptodev_blockcipher.c 
b/app/test/test_cryptodev_blockcipher.c
index 5bfe2d009..2ff7fc91b 100644
--- a/app/test/test_cryptodev_blockcipher.c
+++ b/app/test/test_cryptodev_blockcipher.c
@@ -804,7 +804,7 @@ test_blockcipher_all_tests(struct rte_mempool *mbuf_pool,
        else if (driver_id == nitrox_pmd)
                target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_NITROX;
        else
-               TEST_ASSERT(0, "Unrecognized cryptodev type");
+               return -ENOTSUP; /* Unrecognized cryptodev type */
 
        for (i = 0; i < n_test_cases; i++) {
                const struct blockcipher_test_case *tc = &tcs[i];
diff --git a/app/test/test_cryptodev_des_test_vectors.h 
b/app/test/test_cryptodev_des_test_vectors.h
index 9d2d0e77f..0a362d980 100644
--- a/app/test/test_cryptodev_des_test_vectors.h
+++ b/app/test/test_cryptodev_des_test_vectors.h
@@ -1208,8 +1208,7 @@ static const struct blockcipher_test_case 
triple_des_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_QAT |
                        BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
                        BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
-                       BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
-                       BLOCKCIPHER_TEST_TARGET_PMD_MB
+                       BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR
        },
        {
                .test_descr = "3DES-128-CBC HMAC-SHA1 Decryption Digest"
@@ -1221,8 +1220,7 @@ static const struct blockcipher_test_case 
triple_des_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_QAT |
                        BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
                        BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
-                       BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
-                       BLOCKCIPHER_TEST_TARGET_PMD_MB
+                       BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR
        },
        {
                .test_descr = "3DES-128-CBC HMAC-SHA1 Encryption Digest"
-- 
2.17.1

Reply via email to