test/crypto: skip unsupported cases

Message ID 20200520152612.2920-1-akhil.goyal@nxp.com (mailing list archive)
State Superseded, archived
Delegated to: akhil goyal
Headers
Series test/crypto: skip unsupported cases |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/travis-robot success Travis build: passed
ci/Intel-compilation fail Compilation issues
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-nxp-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-testing fail Testing issues

Commit Message

Akhil Goyal May 20, 2020, 3:26 p.m. UTC
  From: Akhil Goyal <akhil.goyal@nxp.com>

blockcipher cases are either returning TEST_SUCCESS
or TEST_FAILED as status, but the test may not be
supported by the PMD which is also a success case
for the PMD. Hence checking for status == TEST_FAILED
for setting the overall status as failed.

Signed-off-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 app/test/test_cryptodev_blockcipher.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
  

Comments

Ruifeng Wang May 21, 2020, 7:52 a.m. UTC | #1
> -----Original Message-----
> From: akhil.goyal@nxp.com <akhil.goyal@nxp.com>
> Sent: Wednesday, May 20, 2020 11:26 PM
> To: dev@dpdk.org
> Cc: Ruifeng Wang <Ruifeng.Wang@arm.com>; declan.doherty@intel.com;
> asomalap@amd.com; anoobj@marvell.com; roy.fan.zhang@intel.com;
> fiona.trahe@intel.com; rnagadheeraj@marvell.com; adwivedi@marvell.com;
> jianjay.zhou@huawei.com; pablo.de.lara.guarch@intel.com;
> adamx.dybkowski@intel.com; Akhil.goyal@nxp.com
> Subject: [PATCH] test/crypto: skip unsupported cases
>
> From: Akhil Goyal <akhil.goyal@nxp.com>
>
> blockcipher cases are either returning TEST_SUCCESS or TEST_FAILED as
> status, but the test may not be supported by the PMD which is also a success
> case for the PMD. Hence checking for status == TEST_FAILED for setting the
> overall status as failed.
>
> Signed-off-by: Akhil Goyal <akhil.goyal@nxp.com>
> ---
>  app/test/test_cryptodev_blockcipher.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/app/test/test_cryptodev_blockcipher.c
> b/app/test/test_cryptodev_blockcipher.c
> index 642b549717..d033350659 100644
> --- a/app/test/test_cryptodev_blockcipher.c
> +++ b/app/test/test_cryptodev_blockcipher.c
> @@ -107,7 +107,7 @@ test_blockcipher_one_case(const struct
> blockcipher_test_case *t,
>  "Test Skipped.\n");
>  snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN,
>  "SKIPPED");
> -return 0;
> +return TEST_SKIPPED;
>  }
>  }
>  if (t->feature_mask & BLOCKCIPHER_TEST_FEATURE_SG) { @@ -
> 120,7 +120,7 @@ test_blockcipher_one_case(const struct
> blockcipher_test_case *t,
>  "Test Skipped.\n");
>  snprintf(test_msg,
> BLOCKCIPHER_TEST_MSG_LEN,
>  "SKIPPED");
> -return 0;
> +return TEST_SKIPPED;
>  }
>  } else {
>  if (!(feat_flags &
> RTE_CRYPTODEV_FF_IN_PLACE_SGL)) { @@ -129,7 +129,7 @@
> test_blockcipher_one_case(const struct blockcipher_test_case *t,
>  "Test Skipped.\n");
>  snprintf(test_msg,
> BLOCKCIPHER_TEST_MSG_LEN,
>  "SKIPPED");
> -return 0;
> +return TEST_SKIPPED;
>  }
>  }
>
> @@ -146,7 +146,7 @@ test_blockcipher_one_case(const struct
> blockcipher_test_case *t,
>  "Test Skipped.\n");
>  snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN,
>  "SKIPPED");
> -return 0;
> +return TEST_SKIPPED;
>  }
>  }
>
> @@ -163,7 +163,7 @@ test_blockcipher_one_case(const struct
> blockcipher_test_case *t,
>  "Device does not support this algorithm."
>  "Test Skipped.\n");
>  snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN,
> "SKIPPED");
> -return 0;
> +return TEST_SKIPPED;
>  }
>
>  /* preparing data */
> @@ -435,6 +435,7 @@ test_blockcipher_one_case(const struct
> blockcipher_test_case *t,
>  init_xform, sess_priv_mpool);
>  if (status == -ENOTSUP) {
>  snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN,
> "UNSUPPORTED");
> +status = TEST_SKIPPED;
>  goto error_exit;
>  }
>  if (!sess || status < 0) {
> @@ -780,7 +781,7 @@ test_blockcipher_all_tests(struct rte_mempool
> *mbuf_pool,
>  printf("  %u) TestCase %s %s\n", test_index ++,
>  tc->test_descr, test_msg);
>
> -if (status != TEST_SUCCESS) {
> +if (status == TEST_FAILED) {
>  if (overall_status == TEST_SUCCESS)
We can remove this line and overwrite overall_status unconditionally. WDYT?

Thanks
/Ruifeng
>  overall_status = status;
>
> --
> 2.17.1

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
  

Patch

diff --git a/app/test/test_cryptodev_blockcipher.c b/app/test/test_cryptodev_blockcipher.c
index 642b549717..d033350659 100644
--- a/app/test/test_cryptodev_blockcipher.c
+++ b/app/test/test_cryptodev_blockcipher.c
@@ -107,7 +107,7 @@  test_blockcipher_one_case(const struct blockcipher_test_case *t,
 				"Test Skipped.\n");
 			snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN,
 				"SKIPPED");
-			return 0;
+			return TEST_SKIPPED;
 		}
 	}
 	if (t->feature_mask & BLOCKCIPHER_TEST_FEATURE_SG) {
@@ -120,7 +120,7 @@  test_blockcipher_one_case(const struct blockcipher_test_case *t,
 					"Test Skipped.\n");
 				snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN,
 					"SKIPPED");
-				return 0;
+				return TEST_SKIPPED;
 			}
 		} else {
 			if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
@@ -129,7 +129,7 @@  test_blockcipher_one_case(const struct blockcipher_test_case *t,
 					"Test Skipped.\n");
 				snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN,
 					"SKIPPED");
-				return 0;
+				return TEST_SKIPPED;
 			}
 		}
 
@@ -146,7 +146,7 @@  test_blockcipher_one_case(const struct blockcipher_test_case *t,
 				"Test Skipped.\n");
 			snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN,
 				"SKIPPED");
-			return 0;
+			return TEST_SKIPPED;
 		}
 	}
 
@@ -163,7 +163,7 @@  test_blockcipher_one_case(const struct blockcipher_test_case *t,
 			"Device does not support this algorithm."
 			"Test Skipped.\n");
 		snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN, "SKIPPED");
-		return 0;
+		return TEST_SKIPPED;
 	}
 
 	/* preparing data */
@@ -435,6 +435,7 @@  test_blockcipher_one_case(const struct blockcipher_test_case *t,
 				init_xform, sess_priv_mpool);
 		if (status == -ENOTSUP) {
 			snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN, "UNSUPPORTED");
+			status = TEST_SKIPPED;
 			goto error_exit;
 		}
 		if (!sess || status < 0) {
@@ -780,7 +781,7 @@  test_blockcipher_all_tests(struct rte_mempool *mbuf_pool,
 		printf("  %u) TestCase %s %s\n", test_index ++,
 			tc->test_descr, test_msg);
 
-		if (status != TEST_SUCCESS) {
+		if (status == TEST_FAILED) {
 			if (overall_status == TEST_SUCCESS)
 				overall_status = status;