eal: remove deprecated noninclusive API

[dpdk.git] / app / test / test_ipsec.c

diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c
index 9ad07a1..c6d6b88 100644 (file)
--- a/app/test/test_ipsec.c
+++ b/app/test/test_ipsec.c
@@ -15,7 +15,6 @@
 
 #include <rte_crypto.h>
 #include <rte_cryptodev.h>
-#include <rte_cryptodev_pmd.h>
 #include <rte_lcore.h>
 #include <rte_ipsec.h>
 #include <rte_random.h>
@@ -424,7 +423,7 @@ testsuite_teardown(void)
 }
 
 static int
-ut_setup(void)
+ut_setup_ipsec(void)
 {
        struct ipsec_testsuite_params *ts_params = &testsuite_params;
        struct ipsec_unitest_params *ut_params = &unittest_params;
@@ -444,7 +443,7 @@ ut_setup(void)
 }
 
 static void
-ut_teardown(void)
+ut_teardown_ipsec(void)
 {
        struct ipsec_testsuite_params *ts_params = &testsuite_params;
        struct ipsec_unitest_params *ut_params = &unittest_params;
@@ -744,7 +743,7 @@ create_sa(enum rte_security_session_action_type action_type,
        ut->ss[j].type = action_type;
        rc = create_session(ut, &ts->qp_conf, ts->valid_dev, j);
        if (rc != 0)
-               return TEST_FAILED;
+               return rc;
 
        rc = rte_ipsec_sa_init(ut->ss[j].sa, &ut->sa_prm, sz);
        rc = (rc > 0 && (uint32_t)rc <= sz) ? 0 : -EINVAL;
@@ -1247,7 +1246,7 @@ test_ipsec_crypto_inb_burst_null_null(int i)
                        test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* Generate test mbuf data */
@@ -1349,7 +1348,7 @@ test_ipsec_crypto_outb_burst_null_null(int i)
                        test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* Generate input mbuf data */
@@ -1458,7 +1457,7 @@ test_ipsec_inline_crypto_inb_burst_null_null(int i)
                        test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* Generate inbound mbuf data */
@@ -1536,7 +1535,7 @@ test_ipsec_inline_proto_inb_burst_null_null(int i)
                        test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* Generate inbound mbuf data */
@@ -1644,7 +1643,7 @@ test_ipsec_inline_crypto_outb_burst_null_null(int i)
                        test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* Generate test mbuf data */
@@ -1722,7 +1721,7 @@ test_ipsec_inline_proto_outb_burst_null_null(int i)
                        test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* Generate test mbuf data */
@@ -1798,7 +1797,7 @@ test_ipsec_lksd_proto_inb_burst_null_null(int i)
                        test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* Generate test mbuf data */
@@ -1911,7 +1910,7 @@ test_ipsec_replay_inb_inside_null_null(int i)
                        test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* Generate inbound mbuf data */
@@ -2004,7 +2003,7 @@ test_ipsec_replay_inb_outside_null_null(int i)
                        test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* Generate test mbuf data */
@@ -2104,7 +2103,7 @@ test_ipsec_replay_inb_repeat_null_null(int i)
                        test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* Generate test mbuf data */
@@ -2205,7 +2204,7 @@ test_ipsec_replay_inb_inside_burst_null_null(int i)
                        test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* Generate inbound mbuf data */
@@ -2338,7 +2337,7 @@ test_ipsec_crypto_inb_burst_2sa_null_null(int i)
                        test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa 0 failed, cfg %d\n", i);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* create second rte_ipsec_sa */
@@ -2348,7 +2347,7 @@ test_ipsec_crypto_inb_burst_2sa_null_null(int i)
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa 1 failed, cfg %d\n", i);
                destroy_sa(0);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* Generate test mbuf data */
@@ -2424,7 +2423,7 @@ test_ipsec_crypto_inb_burst_2sa_4grp_null_null(int i)
                        test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa 0 failed, cfg %d\n", i);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* create second rte_ipsec_sa */
@@ -2434,7 +2433,7 @@ test_ipsec_crypto_inb_burst_2sa_4grp_null_null(int i)
        if (rc != 0) {
                RTE_LOG(ERR, USER1, "create_sa 1 failed, cfg %d\n", i);
                destroy_sa(0);
-               return TEST_FAILED;
+               return rc;
        }
 
        /* Generate test mbuf data */
@@ -2499,33 +2498,33 @@ static struct unit_test_suite ipsec_testsuite  = {
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_crypto_inb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_crypto_outb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_inline_crypto_inb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_inline_crypto_outb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_inline_proto_inb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_inline_proto_outb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_lksd_proto_inb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_lksd_proto_outb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_replay_inb_inside_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_replay_inb_outside_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_replay_inb_repeat_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_replay_inb_inside_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_crypto_inb_burst_2sa_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_crypto_inb_burst_2sa_4grp_null_null_wrapper),
                TEST_CASES_END() /**< NULL terminate unit test array */
        }