patches for DPDK stable branches
 help / color / mirror / Atom feed
* [PATCH v1 1/1] test: fix named test macro
@ 2023-08-23 10:00 Anatoly Burakov
  2023-08-23 10:05 ` [EXT] " Akhil Goyal
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Anatoly Burakov @ 2023-08-23 10:00 UTC (permalink / raw)
  To: dev, Akhil Goyal, Fan Zhang, Anoob Joseph, Hemant Agrawal,
	Tejasree Kondoj, Ciara Power
  Cc: stable

Currently, the TEST_CASE_NAMED_ST macro is implemented in a way that
is identical to TEST_CASE_NAMED_WITH_DATA. In particular, it expects
the test function to have a data argument, which is why a bunch of tests
have an unused data arguments.

Fix this by adjusting the macro to not expect a test function with data
arguments, and adjust the dependant test cases accordingly.

Fixes: 474f12024dd9 ("test/crypto: add lookaside IPsec cases")
Cc: anoobj@marvell.com
Cc: stable@dpdk.org

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 app/test/test.h                        |  2 +-
 app/test/test_cryptodev.c              | 74 ++++++++++++------------
 app/test/test_security_inline_macsec.c | 48 ++++++++--------
 app/test/test_security_inline_proto.c  | 78 +++++++++++++-------------
 4 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/app/test/test.h b/app/test/test.h
index a91ded76af..95977c59b6 100644
--- a/app/test/test.h
+++ b/app/test/test.h
@@ -127,7 +127,7 @@ struct unit_test_case {
 		{ setup, teardown, NULL, testcase, #testcase, 1, data }
 
 #define TEST_CASE_NAMED_ST(name, setup, teardown, testcase) \
-		{ setup, teardown, NULL, testcase, name, 1, NULL }
+		{ setup, teardown, testcase, NULL, name, 1, NULL }
 
 #define TEST_CASE_NAMED_WITH_DATA(name, setup, teardown, testcase, data) \
 		{ setup, teardown, NULL, testcase, name, 1, data }
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 956268bfcd..6806407784 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -10219,7 +10219,7 @@ test_ipsec_ah_proto_all(const struct ipsec_test_flags *flags)
 }
 
 static int
-test_ipsec_proto_display_list(const void *data __rte_unused)
+test_ipsec_proto_display_list(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10231,7 +10231,7 @@ test_ipsec_proto_display_list(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_ah_tunnel_ipv4(const void *data __rte_unused)
+test_ipsec_proto_ah_tunnel_ipv4(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10244,7 +10244,7 @@ test_ipsec_proto_ah_tunnel_ipv4(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_ah_transport_ipv4(const void *data __rte_unused)
+test_ipsec_proto_ah_transport_ipv4(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10257,7 +10257,7 @@ test_ipsec_proto_ah_transport_ipv4(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_iv_gen(const void *data __rte_unused)
+test_ipsec_proto_iv_gen(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10269,7 +10269,7 @@ test_ipsec_proto_iv_gen(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_sa_exp_pkts_soft(const void *data __rte_unused)
+test_ipsec_proto_sa_exp_pkts_soft(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10281,7 +10281,7 @@ test_ipsec_proto_sa_exp_pkts_soft(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_sa_exp_pkts_hard(const void *data __rte_unused)
+test_ipsec_proto_sa_exp_pkts_hard(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10293,7 +10293,7 @@ test_ipsec_proto_sa_exp_pkts_hard(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_err_icv_corrupt(const void *data __rte_unused)
+test_ipsec_proto_err_icv_corrupt(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10305,7 +10305,7 @@ test_ipsec_proto_err_icv_corrupt(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_udp_encap_custom_ports(const void *data __rte_unused)
+test_ipsec_proto_udp_encap_custom_ports(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10322,7 +10322,7 @@ test_ipsec_proto_udp_encap_custom_ports(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_udp_encap(const void *data __rte_unused)
+test_ipsec_proto_udp_encap(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10334,7 +10334,7 @@ test_ipsec_proto_udp_encap(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_tunnel_src_dst_addr_verify(const void *data __rte_unused)
+test_ipsec_proto_tunnel_src_dst_addr_verify(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10346,7 +10346,7 @@ test_ipsec_proto_tunnel_src_dst_addr_verify(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_tunnel_dst_addr_verify(const void *data __rte_unused)
+test_ipsec_proto_tunnel_dst_addr_verify(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10358,7 +10358,7 @@ test_ipsec_proto_tunnel_dst_addr_verify(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_udp_ports_verify(const void *data __rte_unused)
+test_ipsec_proto_udp_ports_verify(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10371,7 +10371,7 @@ test_ipsec_proto_udp_ports_verify(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_inner_ip_csum(const void *data __rte_unused)
+test_ipsec_proto_inner_ip_csum(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10383,7 +10383,7 @@ test_ipsec_proto_inner_ip_csum(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_inner_l4_csum(const void *data __rte_unused)
+test_ipsec_proto_inner_l4_csum(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10395,7 +10395,7 @@ test_ipsec_proto_inner_l4_csum(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_tunnel_v4_in_v4(const void *data __rte_unused)
+test_ipsec_proto_tunnel_v4_in_v4(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10408,7 +10408,7 @@ test_ipsec_proto_tunnel_v4_in_v4(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_tunnel_v6_in_v6(const void *data __rte_unused)
+test_ipsec_proto_tunnel_v6_in_v6(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10421,7 +10421,7 @@ test_ipsec_proto_tunnel_v6_in_v6(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_tunnel_v4_in_v6(const void *data __rte_unused)
+test_ipsec_proto_tunnel_v4_in_v6(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10434,7 +10434,7 @@ test_ipsec_proto_tunnel_v4_in_v6(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_tunnel_v6_in_v4(const void *data __rte_unused)
+test_ipsec_proto_tunnel_v6_in_v4(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10447,7 +10447,7 @@ test_ipsec_proto_tunnel_v6_in_v4(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_transport_v4(const void *data __rte_unused)
+test_ipsec_proto_transport_v4(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10460,7 +10460,7 @@ test_ipsec_proto_transport_v4(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_transport_l4_csum(const void *data __rte_unused)
+test_ipsec_proto_transport_l4_csum(void)
 {
 	struct ipsec_test_flags flags = {
 		.l4_csum = true,
@@ -10471,7 +10471,7 @@ test_ipsec_proto_transport_l4_csum(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_stats(const void *data __rte_unused)
+test_ipsec_proto_stats(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10483,7 +10483,7 @@ test_ipsec_proto_stats(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_pkt_fragment(const void *data __rte_unused)
+test_ipsec_proto_pkt_fragment(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10496,7 +10496,7 @@ test_ipsec_proto_pkt_fragment(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_copy_df_inner_0(const void *data __rte_unused)
+test_ipsec_proto_copy_df_inner_0(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10508,7 +10508,7 @@ test_ipsec_proto_copy_df_inner_0(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_copy_df_inner_1(const void *data __rte_unused)
+test_ipsec_proto_copy_df_inner_1(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10520,7 +10520,7 @@ test_ipsec_proto_copy_df_inner_1(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_set_df_0_inner_1(const void *data __rte_unused)
+test_ipsec_proto_set_df_0_inner_1(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10532,7 +10532,7 @@ test_ipsec_proto_set_df_0_inner_1(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_set_df_1_inner_0(const void *data __rte_unused)
+test_ipsec_proto_set_df_1_inner_0(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10544,7 +10544,7 @@ test_ipsec_proto_set_df_1_inner_0(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_ipv4_copy_dscp_inner_0(const void *data __rte_unused)
+test_ipsec_proto_ipv4_copy_dscp_inner_0(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10556,7 +10556,7 @@ test_ipsec_proto_ipv4_copy_dscp_inner_0(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_ipv4_copy_dscp_inner_1(const void *data __rte_unused)
+test_ipsec_proto_ipv4_copy_dscp_inner_1(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10568,7 +10568,7 @@ test_ipsec_proto_ipv4_copy_dscp_inner_1(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_ipv4_set_dscp_0_inner_1(const void *data __rte_unused)
+test_ipsec_proto_ipv4_set_dscp_0_inner_1(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10584,7 +10584,7 @@ test_ipsec_proto_ipv4_set_dscp_0_inner_1(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_ipv4_set_dscp_1_inner_0(const void *data __rte_unused)
+test_ipsec_proto_ipv4_set_dscp_1_inner_0(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10600,7 +10600,7 @@ test_ipsec_proto_ipv4_set_dscp_1_inner_0(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_ipv6_copy_dscp_inner_0(const void *data __rte_unused)
+test_ipsec_proto_ipv6_copy_dscp_inner_0(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10614,7 +10614,7 @@ test_ipsec_proto_ipv6_copy_dscp_inner_0(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_ipv6_copy_dscp_inner_1(const void *data __rte_unused)
+test_ipsec_proto_ipv6_copy_dscp_inner_1(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10628,7 +10628,7 @@ test_ipsec_proto_ipv6_copy_dscp_inner_1(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_ipv6_set_dscp_0_inner_1(const void *data __rte_unused)
+test_ipsec_proto_ipv6_set_dscp_0_inner_1(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10646,7 +10646,7 @@ test_ipsec_proto_ipv6_set_dscp_0_inner_1(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_ipv6_set_dscp_1_inner_0(const void *data __rte_unused)
+test_ipsec_proto_ipv6_set_dscp_1_inner_0(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -10664,7 +10664,7 @@ test_ipsec_proto_ipv6_set_dscp_1_inner_0(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_sgl(const void *data __rte_unused)
+test_ipsec_proto_sgl(void)
 {
 	struct crypto_testsuite_params *ts_params = &testsuite_params;
 	struct rte_cryptodev_info dev_info;
@@ -10872,7 +10872,7 @@ test_PDCP_PROTO_all(void)
 }
 
 static int
-test_ipsec_proto_ipv4_ttl_decrement(const void *data __rte_unused)
+test_ipsec_proto_ipv4_ttl_decrement(void)
 {
 	struct ipsec_test_flags flags = {
 		.dec_ttl_or_hop_limit = true
@@ -10882,7 +10882,7 @@ test_ipsec_proto_ipv4_ttl_decrement(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_proto_ipv6_hop_limit_decrement(const void *data __rte_unused)
+test_ipsec_proto_ipv6_hop_limit_decrement(void)
 {
 	struct ipsec_test_flags flags = {
 		.ipv6 = true,
diff --git a/app/test/test_security_inline_macsec.c b/app/test/test_security_inline_macsec.c
index bfb9e09752..475f2aec83 100644
--- a/app/test/test_security_inline_macsec.c
+++ b/app/test/test_security_inline_macsec.c
@@ -1181,7 +1181,7 @@ test_macsec(const struct mcs_test_vector *td[], enum mcs_op op, const struct mcs
 }
 
 static int
-test_inline_macsec_encap_all(const void *data __rte_unused)
+test_inline_macsec_encap_all(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1215,7 +1215,7 @@ test_inline_macsec_encap_all(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_decap_all(const void *data __rte_unused)
+test_inline_macsec_decap_all(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1247,7 +1247,7 @@ test_inline_macsec_decap_all(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_auth_only_all(const void *data __rte_unused)
+test_inline_macsec_auth_only_all(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1281,7 +1281,7 @@ test_inline_macsec_auth_only_all(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_verify_only_all(const void *data __rte_unused)
+test_inline_macsec_verify_only_all(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1314,7 +1314,7 @@ test_inline_macsec_verify_only_all(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_encap_decap_all(const void *data __rte_unused)
+test_inline_macsec_encap_decap_all(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1350,7 +1350,7 @@ test_inline_macsec_encap_decap_all(const void *data __rte_unused)
 
 
 static int
-test_inline_macsec_auth_verify_all(const void *data __rte_unused)
+test_inline_macsec_auth_verify_all(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1384,7 +1384,7 @@ test_inline_macsec_auth_verify_all(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_multi_flow(const void *data __rte_unused)
+test_inline_macsec_multi_flow(void)
 {
 	const struct mcs_test_vector *tv[MCS_MAX_FLOWS];
 	struct mcs_test_vector iter[MCS_MAX_FLOWS];
@@ -1429,7 +1429,7 @@ test_inline_macsec_multi_flow(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_with_vlan(const void *data __rte_unused)
+test_inline_macsec_with_vlan(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1492,7 +1492,7 @@ test_inline_macsec_with_vlan(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_pkt_drop(const void *data __rte_unused)
+test_inline_macsec_pkt_drop(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1527,7 +1527,7 @@ test_inline_macsec_pkt_drop(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_untagged_rx(const void *data __rte_unused)
+test_inline_macsec_untagged_rx(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1572,7 +1572,7 @@ test_inline_macsec_untagged_rx(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_bad_tag_rx(const void *data __rte_unused)
+test_inline_macsec_bad_tag_rx(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1606,7 +1606,7 @@ test_inline_macsec_bad_tag_rx(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_sa_not_in_use(const void *data __rte_unused)
+test_inline_macsec_sa_not_in_use(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1640,7 +1640,7 @@ test_inline_macsec_sa_not_in_use(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_decap_stats(const void *data __rte_unused)
+test_inline_macsec_decap_stats(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1675,7 +1675,7 @@ test_inline_macsec_decap_stats(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_verify_only_stats(const void *data __rte_unused)
+test_inline_macsec_verify_only_stats(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1710,7 +1710,7 @@ test_inline_macsec_verify_only_stats(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_pkts_invalid_stats(const void *data __rte_unused)
+test_inline_macsec_pkts_invalid_stats(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1741,7 +1741,7 @@ test_inline_macsec_pkts_invalid_stats(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_pkts_unchecked_stats(const void *data __rte_unused)
+test_inline_macsec_pkts_unchecked_stats(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1774,7 +1774,7 @@ test_inline_macsec_pkts_unchecked_stats(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_out_pkts_untagged(const void *data __rte_unused)
+test_inline_macsec_out_pkts_untagged(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1807,7 +1807,7 @@ test_inline_macsec_out_pkts_untagged(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_out_pkts_toolong(const void *data __rte_unused)
+test_inline_macsec_out_pkts_toolong(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1840,7 +1840,7 @@ test_inline_macsec_out_pkts_toolong(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_encap_stats(const void *data __rte_unused)
+test_inline_macsec_encap_stats(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1872,7 +1872,7 @@ test_inline_macsec_encap_stats(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_auth_only_stats(const void *data __rte_unused)
+test_inline_macsec_auth_only_stats(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1904,7 +1904,7 @@ test_inline_macsec_auth_only_stats(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_interrupts_all(const void *data __rte_unused)
+test_inline_macsec_interrupts_all(void)
 {
 	struct mcs_err_vector err_vector = {0};
 	const struct mcs_test_vector *cur_td;
@@ -1957,7 +1957,7 @@ test_inline_macsec_interrupts_all(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_rekey_tx(const void *data __rte_unused)
+test_inline_macsec_rekey_tx(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -1994,7 +1994,7 @@ test_inline_macsec_rekey_tx(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_rekey_rx(const void *data __rte_unused)
+test_inline_macsec_rekey_rx(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
@@ -2029,7 +2029,7 @@ test_inline_macsec_rekey_rx(const void *data __rte_unused)
 }
 
 static int
-test_inline_macsec_anti_replay(const void *data __rte_unused)
+test_inline_macsec_anti_replay(void)
 {
 	const struct mcs_test_vector *cur_td;
 	struct mcs_test_opts opts = {0};
diff --git a/app/test/test_security_inline_proto.c b/app/test/test_security_inline_proto.c
index 45aa742c6b..e277c53991 100644
--- a/app/test/test_security_inline_proto.c
+++ b/app/test/test_security_inline_proto.c
@@ -2076,7 +2076,7 @@ test_ipsec_inline_proto_known_vec_inb(const void *test_data)
 }
 
 static int
-test_ipsec_inline_proto_display_list(const void *data __rte_unused)
+test_ipsec_inline_proto_display_list(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2089,7 +2089,7 @@ test_ipsec_inline_proto_display_list(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_udp_encap(const void *data __rte_unused)
+test_ipsec_inline_proto_udp_encap(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2102,7 +2102,7 @@ test_ipsec_inline_proto_udp_encap(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_udp_ports_verify(const void *data __rte_unused)
+test_ipsec_inline_proto_udp_ports_verify(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2116,7 +2116,7 @@ test_ipsec_inline_proto_udp_ports_verify(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_err_icv_corrupt(const void *data __rte_unused)
+test_ipsec_inline_proto_err_icv_corrupt(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2129,7 +2129,7 @@ test_ipsec_inline_proto_err_icv_corrupt(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_tunnel_dst_addr_verify(const void *data __rte_unused)
+test_ipsec_inline_proto_tunnel_dst_addr_verify(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2142,7 +2142,7 @@ test_ipsec_inline_proto_tunnel_dst_addr_verify(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_tunnel_src_dst_addr_verify(const void *data __rte_unused)
+test_ipsec_inline_proto_tunnel_src_dst_addr_verify(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2155,7 +2155,7 @@ test_ipsec_inline_proto_tunnel_src_dst_addr_verify(const void *data __rte_unused
 }
 
 static int
-test_ipsec_inline_proto_inner_ip_csum(const void *data __rte_unused)
+test_ipsec_inline_proto_inner_ip_csum(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2168,7 +2168,7 @@ test_ipsec_inline_proto_inner_ip_csum(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_inner_l4_csum(const void *data __rte_unused)
+test_ipsec_inline_proto_inner_l4_csum(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2181,7 +2181,7 @@ test_ipsec_inline_proto_inner_l4_csum(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_tunnel_v4_in_v4(const void *data __rte_unused)
+test_ipsec_inline_proto_tunnel_v4_in_v4(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2195,7 +2195,7 @@ test_ipsec_inline_proto_tunnel_v4_in_v4(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_tunnel_v6_in_v6(const void *data __rte_unused)
+test_ipsec_inline_proto_tunnel_v6_in_v6(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2209,7 +2209,7 @@ test_ipsec_inline_proto_tunnel_v6_in_v6(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_tunnel_v4_in_v6(const void *data __rte_unused)
+test_ipsec_inline_proto_tunnel_v4_in_v6(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2223,7 +2223,7 @@ test_ipsec_inline_proto_tunnel_v4_in_v6(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_tunnel_v6_in_v4(const void *data __rte_unused)
+test_ipsec_inline_proto_tunnel_v6_in_v4(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2237,7 +2237,7 @@ test_ipsec_inline_proto_tunnel_v6_in_v4(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_transport_v4(const void *data __rte_unused)
+test_ipsec_inline_proto_transport_v4(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2251,7 +2251,7 @@ test_ipsec_inline_proto_transport_v4(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_transport_l4_csum(const void *data __rte_unused)
+test_ipsec_inline_proto_transport_l4_csum(void)
 {
 	struct ipsec_test_flags flags = {
 		.l4_csum = true,
@@ -2263,7 +2263,7 @@ test_ipsec_inline_proto_transport_l4_csum(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_stats(const void *data __rte_unused)
+test_ipsec_inline_proto_stats(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2276,7 +2276,7 @@ test_ipsec_inline_proto_stats(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_pkt_fragment(const void *data __rte_unused)
+test_ipsec_inline_proto_pkt_fragment(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2290,7 +2290,7 @@ test_ipsec_inline_proto_pkt_fragment(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_copy_df_inner_0(const void *data __rte_unused)
+test_ipsec_inline_proto_copy_df_inner_0(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2303,7 +2303,7 @@ test_ipsec_inline_proto_copy_df_inner_0(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_copy_df_inner_1(const void *data __rte_unused)
+test_ipsec_inline_proto_copy_df_inner_1(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2316,7 +2316,7 @@ test_ipsec_inline_proto_copy_df_inner_1(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_set_df_0_inner_1(const void *data __rte_unused)
+test_ipsec_inline_proto_set_df_0_inner_1(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2329,7 +2329,7 @@ test_ipsec_inline_proto_set_df_0_inner_1(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_set_df_1_inner_0(const void *data __rte_unused)
+test_ipsec_inline_proto_set_df_1_inner_0(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2342,7 +2342,7 @@ test_ipsec_inline_proto_set_df_1_inner_0(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_ipv4_copy_dscp_inner_0(const void *data __rte_unused)
+test_ipsec_inline_proto_ipv4_copy_dscp_inner_0(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2355,7 +2355,7 @@ test_ipsec_inline_proto_ipv4_copy_dscp_inner_0(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_ipv4_copy_dscp_inner_1(const void *data __rte_unused)
+test_ipsec_inline_proto_ipv4_copy_dscp_inner_1(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2368,7 +2368,7 @@ test_ipsec_inline_proto_ipv4_copy_dscp_inner_1(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_ipv4_set_dscp_0_inner_1(const void *data __rte_unused)
+test_ipsec_inline_proto_ipv4_set_dscp_0_inner_1(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2381,7 +2381,7 @@ test_ipsec_inline_proto_ipv4_set_dscp_0_inner_1(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_ipv4_set_dscp_1_inner_0(const void *data __rte_unused)
+test_ipsec_inline_proto_ipv4_set_dscp_1_inner_0(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2394,7 +2394,7 @@ test_ipsec_inline_proto_ipv4_set_dscp_1_inner_0(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_ipv6_copy_dscp_inner_0(const void *data __rte_unused)
+test_ipsec_inline_proto_ipv6_copy_dscp_inner_0(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2409,7 +2409,7 @@ test_ipsec_inline_proto_ipv6_copy_dscp_inner_0(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_ipv6_copy_dscp_inner_1(const void *data __rte_unused)
+test_ipsec_inline_proto_ipv6_copy_dscp_inner_1(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2424,7 +2424,7 @@ test_ipsec_inline_proto_ipv6_copy_dscp_inner_1(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_ipv6_set_dscp_0_inner_1(const void *data __rte_unused)
+test_ipsec_inline_proto_ipv6_set_dscp_0_inner_1(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2439,7 +2439,7 @@ test_ipsec_inline_proto_ipv6_set_dscp_0_inner_1(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_ipv6_set_dscp_1_inner_0(const void *data __rte_unused)
+test_ipsec_inline_proto_ipv6_set_dscp_1_inner_0(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2454,7 +2454,7 @@ test_ipsec_inline_proto_ipv6_set_dscp_1_inner_0(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_ipv6_copy_flabel_inner_0(const void *data __rte_unused)
+test_ipsec_inline_proto_ipv6_copy_flabel_inner_0(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2468,7 +2468,7 @@ test_ipsec_inline_proto_ipv6_copy_flabel_inner_0(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_ipv6_copy_flabel_inner_1(const void *data __rte_unused)
+test_ipsec_inline_proto_ipv6_copy_flabel_inner_1(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2482,7 +2482,7 @@ test_ipsec_inline_proto_ipv6_copy_flabel_inner_1(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_ipv6_set_flabel_0_inner_1(const void *data __rte_unused)
+test_ipsec_inline_proto_ipv6_set_flabel_0_inner_1(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2496,7 +2496,7 @@ test_ipsec_inline_proto_ipv6_set_flabel_0_inner_1(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_ipv6_set_flabel_1_inner_0(const void *data __rte_unused)
+test_ipsec_inline_proto_ipv6_set_flabel_1_inner_0(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2510,7 +2510,7 @@ test_ipsec_inline_proto_ipv6_set_flabel_1_inner_0(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_ipv4_ttl_decrement(const void *data __rte_unused)
+test_ipsec_inline_proto_ipv4_ttl_decrement(void)
 {
 	struct ipsec_test_flags flags = {
 		.dec_ttl_or_hop_limit = true,
@@ -2521,7 +2521,7 @@ test_ipsec_inline_proto_ipv4_ttl_decrement(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_ipv6_hop_limit_decrement(const void *data __rte_unused)
+test_ipsec_inline_proto_ipv6_hop_limit_decrement(void)
 {
 	struct ipsec_test_flags flags = {
 		.ipv6 = true,
@@ -2533,7 +2533,7 @@ test_ipsec_inline_proto_ipv6_hop_limit_decrement(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_iv_gen(const void *data __rte_unused)
+test_ipsec_inline_proto_iv_gen(void)
 {
 	struct ipsec_test_flags flags;
 
@@ -2546,7 +2546,7 @@ test_ipsec_inline_proto_iv_gen(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_sa_pkt_soft_expiry(const void *data __rte_unused)
+test_ipsec_inline_proto_sa_pkt_soft_expiry(void)
 {
 	struct ipsec_test_flags flags = {
 		.sa_expiry_pkts_soft = true,
@@ -2555,7 +2555,7 @@ test_ipsec_inline_proto_sa_pkt_soft_expiry(const void *data __rte_unused)
 	return test_ipsec_inline_proto_all(&flags);
 }
 static int
-test_ipsec_inline_proto_sa_byte_soft_expiry(const void *data __rte_unused)
+test_ipsec_inline_proto_sa_byte_soft_expiry(void)
 {
 	struct ipsec_test_flags flags = {
 		.sa_expiry_bytes_soft = true,
@@ -2565,7 +2565,7 @@ test_ipsec_inline_proto_sa_byte_soft_expiry(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_sa_pkt_hard_expiry(const void *data __rte_unused)
+test_ipsec_inline_proto_sa_pkt_hard_expiry(void)
 {
 	struct ipsec_test_flags flags = {
 		.sa_expiry_pkts_hard = true
@@ -2575,7 +2575,7 @@ test_ipsec_inline_proto_sa_pkt_hard_expiry(const void *data __rte_unused)
 }
 
 static int
-test_ipsec_inline_proto_sa_byte_hard_expiry(const void *data __rte_unused)
+test_ipsec_inline_proto_sa_byte_hard_expiry(void)
 {
 	struct ipsec_test_flags flags = {
 		.sa_expiry_bytes_hard = true
-- 
2.37.2


^ permalink raw reply	[flat|nested] 5+ messages in thread

* RE: [EXT] [PATCH v1 1/1] test: fix named test macro
  2023-08-23 10:00 [PATCH v1 1/1] test: fix named test macro Anatoly Burakov
@ 2023-08-23 10:05 ` Akhil Goyal
  2023-08-23 10:11 ` Hemant Agrawal
  2023-08-23 10:51 ` [EXT] " Anoob Joseph
  2 siblings, 0 replies; 5+ messages in thread
From: Akhil Goyal @ 2023-08-23 10:05 UTC (permalink / raw)
  To: Anatoly Burakov, dev, Fan Zhang, Anoob Joseph, Hemant Agrawal,
	Tejasree Kondoj, Ciara Power
  Cc: stable

> Currently, the TEST_CASE_NAMED_ST macro is implemented in a way that
> is identical to TEST_CASE_NAMED_WITH_DATA. In particular, it expects
> the test function to have a data argument, which is why a bunch of tests
> have an unused data arguments.
> 
> Fix this by adjusting the macro to not expect a test function with data
> arguments, and adjust the dependant test cases accordingly.
> 
> Fixes: 474f12024dd9 ("test/crypto: add lookaside IPsec cases")
> Cc: anoobj@marvell.com
> Cc: stable@dpdk.org
> 
> Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>

Thanks for the fix Anatoly.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v1 1/1] test: fix named test macro
  2023-08-23 10:00 [PATCH v1 1/1] test: fix named test macro Anatoly Burakov
  2023-08-23 10:05 ` [EXT] " Akhil Goyal
@ 2023-08-23 10:11 ` Hemant Agrawal
  2023-08-23 10:51 ` [EXT] " Anoob Joseph
  2 siblings, 0 replies; 5+ messages in thread
From: Hemant Agrawal @ 2023-08-23 10:11 UTC (permalink / raw)
  To: Anatoly Burakov, dev, Akhil Goyal, Fan Zhang, Anoob Joseph,
	Hemant Agrawal, Tejasree Kondoj, Ciara Power
  Cc: stable

Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>



^ permalink raw reply	[flat|nested] 5+ messages in thread

* RE: [EXT] [PATCH v1 1/1] test: fix named test macro
  2023-08-23 10:00 [PATCH v1 1/1] test: fix named test macro Anatoly Burakov
  2023-08-23 10:05 ` [EXT] " Akhil Goyal
  2023-08-23 10:11 ` Hemant Agrawal
@ 2023-08-23 10:51 ` Anoob Joseph
  2023-09-06  8:28   ` Akhil Goyal
  2 siblings, 1 reply; 5+ messages in thread
From: Anoob Joseph @ 2023-08-23 10:51 UTC (permalink / raw)
  To: Anatoly Burakov
  Cc: stable, dev, Akhil Goyal, Fan Zhang, Hemant Agrawal,
	Tejasree Kondoj, Ciara Power

> Currently, the TEST_CASE_NAMED_ST macro is implemented in a way that is
> identical to TEST_CASE_NAMED_WITH_DATA. In particular, it expects the
> test function to have a data argument, which is why a bunch of tests have an
> unused data arguments.
> 
> Fix this by adjusting the macro to not expect a test function with data
> arguments, and adjust the dependant test cases accordingly.
> 
> Fixes: 474f12024dd9 ("test/crypto: add lookaside IPsec cases")
> Cc: anoobj@marvell.com
> Cc: stable@dpdk.org
> 
> Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
> ---
>  app/test/test.h                        |  2 +-
>  app/test/test_cryptodev.c              | 74 ++++++++++++------------
>  app/test/test_security_inline_macsec.c | 48 ++++++++--------
> app/test/test_security_inline_proto.c  | 78 +++++++++++++-------------
>  4 files changed, 101 insertions(+), 101 deletions(-)
> 

Acked-by: Anoob Joseph <anoobj@marvell.com>



^ permalink raw reply	[flat|nested] 5+ messages in thread

* RE: [EXT] [PATCH v1 1/1] test: fix named test macro
  2023-08-23 10:51 ` [EXT] " Anoob Joseph
@ 2023-09-06  8:28   ` Akhil Goyal
  0 siblings, 0 replies; 5+ messages in thread
From: Akhil Goyal @ 2023-09-06  8:28 UTC (permalink / raw)
  To: Anoob Joseph, Anatoly Burakov
  Cc: stable, dev, Fan Zhang, Hemant Agrawal, Tejasree Kondoj, Ciara Power

> Subject: RE: [EXT] [PATCH v1 1/1] test: fix named test macro
> 
> > Currently, the TEST_CASE_NAMED_ST macro is implemented in a way that is
> > identical to TEST_CASE_NAMED_WITH_DATA. In particular, it expects the
> > test function to have a data argument, which is why a bunch of tests have an
> > unused data arguments.
> >
> > Fix this by adjusting the macro to not expect a test function with data
> > arguments, and adjust the dependant test cases accordingly.
> >
> > Fixes: 474f12024dd9 ("test/crypto: add lookaside IPsec cases")
> > Cc: anoobj@marvell.com
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
> Acked-by: Anoob Joseph <anoobj@marvell.com>
Applied to dpdk-next-crypto
Thanks.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-09-06  8:28 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-23 10:00 [PATCH v1 1/1] test: fix named test macro Anatoly Burakov
2023-08-23 10:05 ` [EXT] " Akhil Goyal
2023-08-23 10:11 ` Hemant Agrawal
2023-08-23 10:51 ` [EXT] " Anoob Joseph
2023-09-06  8:28   ` Akhil Goyal

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).