test: skip tests when missing requirements

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

diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c
index 4342b73..83f7895 100644 (file)
--- a/app/test/test_ipsec.c
+++ b/app/test/test_ipsec.c
@@ -296,8 +296,8 @@ testsuite_setup(void)
 
        nb_devs = rte_cryptodev_count();
        if (nb_devs < 1) {
-               RTE_LOG(ERR, USER1, "No crypto devices found?\n");
-               return TEST_FAILED;
+               RTE_LOG(WARNING, USER1, "No crypto devices found?\n");
+               return TEST_SKIPPED;
        }
 
        /* Find first valid crypto device */
@@ -531,13 +531,13 @@ const char null_encrypted_data[] =
        "Network Security People Have A Strange Sense Of Humor unlike Other "
        "People who have a normal sense of humour";
 
-struct ipv4_hdr ipv4_outer  = {
+struct rte_ipv4_hdr ipv4_outer  = {
        .version_ihl = IPVERSION << 4 |
-               sizeof(ipv4_outer) / IPV4_IHL_MULTIPLIER,
+               sizeof(ipv4_outer) / RTE_IPV4_IHL_MULTIPLIER,
        .time_to_live = IPDEFTTL,
        .next_proto_id = IPPROTO_ESP,
-       .src_addr = IPv4(192, 168, 1, 100),
-       .dst_addr = IPv4(192, 168, 2, 100),
+       .src_addr = RTE_IPV4(192, 168, 1, 100),
+       .dst_addr = RTE_IPV4(192, 168, 2, 100),
 };
 
 static struct rte_mbuf *
@@ -569,7 +569,8 @@ setup_test_string_tunneled(struct rte_mempool *mpool, const char *string,
        size_t len, uint32_t spi, uint32_t seq)
 {
        struct rte_mbuf *m = rte_pktmbuf_alloc(mpool);
-       uint32_t hdrlen = sizeof(struct ipv4_hdr) + sizeof(struct rte_esp_hdr);
+       uint32_t hdrlen = sizeof(struct rte_ipv4_hdr) +
+               sizeof(struct rte_esp_hdr);
        uint32_t taillen = sizeof(struct esp_tail);
        uint32_t t_len = len + hdrlen + taillen;
        uint32_t padlen;