From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 643EDA0558; Thu, 26 May 2022 10:03:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B3A542B8E; Thu, 26 May 2022 10:03:00 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id D56A6427EE for ; Thu, 26 May 2022 10:02:58 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24Q2AfQs003176; Thu, 26 May 2022 01:02:58 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=mKRv2pd/K7Xrzu1Cy6WG5rTeQkmKqaXvKj9FnNy84FI=; b=aVRfnQ4W7XTYzNIXRAveSl7A8zfDTIGSHOmDneN3pjDY3Cg7kW14fcqfROTWAB2RXW7u B8+RUxtSIoFh5Liqs9YoGlNo7C7yjjDG/J1CYiv6lyx5ikKRQyA61CWeg5hhwi+a4xo8 ogsYwjaYfxCv3zpG8VQodBL3RZtiTV+lJ8YtnObKlPbf/78B9imSGFeV0ZCweH9GJkT+ Gm63IbQ9/6YbqS2UefsVsHi+XZFCxPfyhS07Lz/dsqugLoeylMkAsvbZMI39VYgbMh/T rIL8ngXNKIZGAMIgjqdEHO/gltkxK6Tlosgj8rEQz0lVCIT9hVGKNG1C/4FpwM4e1BVN Ag== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3g9jap4qmx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 26 May 2022 01:02:57 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 26 May 2022 01:02:56 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 26 May 2022 01:02:56 -0700 Received: from localhost.localdomain (unknown [10.28.34.38]) by maili.marvell.com (Postfix) with ESMTP id 0EABD3F7078; Thu, 26 May 2022 01:02:53 -0700 (PDT) From: Gowrishankar Muthukrishnan To: CC: Fan Zhang , Brian Dooley , , Anoob Joseph , Archana Muniganti , Jerin Jacob , Gowrishankar Muthukrishnan Subject: [v7, 09/11] examples/fips_validation: cleanup bypass tests in response file Date: Thu, 26 May 2022 13:32:22 +0530 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: qrcOfS6RrGBAHgnNdRAm_HvMtOBS1mAH X-Proofpoint-ORIG-GUID: qrcOfS6RrGBAHgnNdRAm_HvMtOBS1mAH X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-05-26_02,2022-05-25_02,2022-02-23_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Remove garbage entries for bypassed tests in response file. Signed-off-by: Gowrishankar Muthukrishnan --- examples/fips_validation/main.c | 74 ++++++++++++++++----------------- 1 file changed, 35 insertions(+), 39 deletions(-) diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index d104d82221..c203ad2ac2 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -804,7 +804,7 @@ prepare_aes_xform(struct rte_crypto_sym_xform *xform) RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n", info.device_name, cipher_xform->key.length, cipher_xform->iv.length); - return -EPERM; + return -ENOTSUP; } return 0; @@ -852,7 +852,7 @@ prepare_tdes_xform(struct rte_crypto_sym_xform *xform) RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n", info.device_name, cipher_xform->key.length, cipher_xform->iv.length); - return -EPERM; + return -ENOTSUP; } return 0; @@ -889,7 +889,7 @@ prepare_hmac_xform(struct rte_crypto_sym_xform *xform) RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n", info.device_name, auth_xform->key.length, auth_xform->digest_length); - return -EPERM; + return -ENOTSUP; } return 0; @@ -935,7 +935,7 @@ prepare_gcm_xform(struct rte_crypto_sym_xform *xform) aead_xform->digest_length, aead_xform->aad_length, aead_xform->iv.length); - return -EPERM; + return -ENOTSUP; } return 0; @@ -980,7 +980,7 @@ prepare_gmac_xform(struct rte_crypto_sym_xform *xform) info.device_name, auth_xform->key.length, auth_xform->digest_length, auth_xform->iv.length); - return -EPERM; + return -ENOTSUP; } return 0; @@ -1018,7 +1018,7 @@ prepare_cmac_xform(struct rte_crypto_sym_xform *xform) RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n", info.device_name, auth_xform->key.length, auth_xform->digest_length); - return -EPERM; + return -ENOTSUP; } return 0; @@ -1064,7 +1064,7 @@ prepare_ccm_xform(struct rte_crypto_sym_xform *xform) aead_xform->digest_length, aead_xform->aad_length, aead_xform->iv.length); - return -EPERM; + return -ENOTSUP; } return 0; @@ -1099,7 +1099,7 @@ prepare_sha_xform(struct rte_crypto_sym_xform *xform) RTE_LOG(ERR, USER1, "PMD %s key length %u digest length %u\n", info.device_name, auth_xform->key.length, auth_xform->digest_length); - return -EPERM; + return -ENOTSUP; } return 0; @@ -1139,7 +1139,7 @@ prepare_xts_xform(struct rte_crypto_sym_xform *xform) RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n", info.device_name, cipher_xform->key.length, cipher_xform->iv.length); - return -EPERM; + return -ENOTSUP; } return 0; @@ -1254,7 +1254,7 @@ fips_generic_test(void) ret = fips_run_test(); if (ret < 0) { - if (ret == -EPERM || ret == -ENOTSUP) { + if (ret == -ENOTSUP) { fprintf(info.fp_wr, "Bypass\n\n"); return 0; } @@ -1291,7 +1291,7 @@ fips_generic_test(void) fprintf(info.fp_wr, "\n"); free(val.val); - return 0; + return 1; } static int @@ -1460,7 +1460,7 @@ fips_mct_tdes_test(void) free(val.val); - return 0; + return 1; } static int @@ -1539,7 +1539,7 @@ fips_mct_aes_ecb_test(void) free(val.val); - return 0; + return 1; } static int fips_mct_aes_test(void) @@ -1647,7 +1647,7 @@ fips_mct_aes_test(void) free(val.val); - return 0; + return 1; } static int @@ -1733,7 +1733,7 @@ fips_mct_sha_test(void) free(val.val); - return 0; + return 1; } @@ -1848,18 +1848,15 @@ fips_test_one_file(void) } ret = fips_test_parse_one_case(); - switch (ret) { - case 0: - ret = test_ops.test(); - if (ret == 0) - break; - RTE_LOG(ERR, USER1, "Error %i: test block\n", + if (ret < 0) { + RTE_LOG(ERR, USER1, "Error %i: Parse block\n", ret); goto error_one_case; - case 1: - break; - default: - RTE_LOG(ERR, USER1, "Error %i: Parse block\n", + } + + ret = test_ops.test(); + if (ret < 0) { + RTE_LOG(ERR, USER1, "Error %i: test block\n", ret); goto error_one_case; } @@ -1909,22 +1906,21 @@ fips_test_one_test_case(void) int ret; ret = fips_test_parse_one_json_case(); + if (ret < 0) { + RTE_LOG(ERR, USER1, "Error %i: Parse block\n", + ret); + goto exit; + } - switch (ret) { - case 0: - ret = test_ops.test(); - if (ret == 0) - break; + ret = test_ops.test(); + if (ret < 0) { RTE_LOG(ERR, USER1, "Error %i: test block\n", ret); - break; - case 1: - break; - default: - RTE_LOG(ERR, USER1, "Error %i: Parse block\n", - ret); + goto exit; } - return 0; + +exit: + return ret; } static int @@ -1969,8 +1965,8 @@ fips_test_one_test_group(void) tests_size = json_array_size(tests); for (test_idx = 0; test_idx < tests_size; test_idx++) { json_info.json_test_case = json_array_get(tests, test_idx); - fips_test_one_test_case(); - json_array_append_new(write_tests, json_info.json_write_case); + if (fips_test_one_test_case() > 0) + json_array_append_new(write_tests, json_info.json_write_case); } return 0; -- 2.25.1