diff options
Diffstat (limited to 'test/gtest')
-rw-r--r-- | test/gtest/Makefile | 1 | ||||
-rw-r--r-- | test/gtest/test_tle_ctx.cpp | 1 | ||||
-rw-r--r-- | test/gtest/test_tle_tcp_stream.cpp | 4 | ||||
-rw-r--r-- | test/gtest/test_tle_tcp_stream.h | 4 | ||||
-rw-r--r-- | test/gtest/test_tle_udp_destroy.cpp | 1 | ||||
-rw-r--r-- | test/gtest/test_tle_udp_stream_gen.cpp | 53 | ||||
-rw-r--r-- | test/gtest/test_tle_udp_stream_gen.h | 2 |
7 files changed, 36 insertions, 30 deletions
diff --git a/test/gtest/Makefile b/test/gtest/Makefile index e980c23..2f7b800 100644 --- a/test/gtest/Makefile +++ b/test/gtest/Makefile @@ -95,6 +95,7 @@ CXXFLAGS += $(EXTRA_CFLAGS) LDFLAGS += -lstdc++ LDFLAGS += -L$(GMOCK_DIR) -L$(GMOCK_DIR)/../lib -lgmock +LDLIBS += -L$(GMOCK_DIR)/gtest -L$(GMOCK_DIR)/../lib -lgtest LDLIBS += -whole-archive -ltle_l4p -ltle_dring include $(TLDK_ROOT)/mk/tle.cpp-obj.mk diff --git a/test/gtest/test_tle_ctx.cpp b/test/gtest/test_tle_ctx.cpp index b9808ee..bbb36e0 100644 --- a/test/gtest/test_tle_ctx.cpp +++ b/test/gtest/test_tle_ctx.cpp @@ -32,6 +32,7 @@ TEST(ctx_create, create_invalid_socket) memset(&prm, 0, sizeof(prm)); prm.socket_id = SOCKET_ID_ANY; prm.max_streams = 0x10; + prm.min_streams = 0x10; prm.max_stream_rbufs = 0x100; prm.max_stream_sbufs = 0x100; diff --git a/test/gtest/test_tle_tcp_stream.cpp b/test/gtest/test_tle_tcp_stream.cpp index b861049..1538f0b 100644 --- a/test/gtest/test_tle_tcp_stream.cpp +++ b/test/gtest/test_tle_tcp_stream.cpp @@ -86,7 +86,7 @@ TEST_F(test_tle_tcp_stream, tcp_stream_test_open_duplicate_ipv4) stream_dup = tle_tcp_stream_open(ctx, (const struct tle_tcp_stream_param*)&stream_prm); ASSERT_EQ(stream_dup, nullptr); - ASSERT_EQ(rte_errno, EEXIST); + ASSERT_EQ(rte_errno, EADDRINUSE); ret = tle_tcp_stream_close(stream); ASSERT_EQ(ret, 0); @@ -103,7 +103,7 @@ TEST_F(test_tle_tcp_stream, tcp_stream_test_open_duplicate_ipv6) stream_dup = tle_tcp_stream_open(ctx, (const struct tle_tcp_stream_param*)&stream_prm6); ASSERT_EQ(stream_dup, nullptr); - ASSERT_EQ(rte_errno, EEXIST); + ASSERT_EQ(rte_errno, EADDRINUSE); ret = tle_tcp_stream_close(stream6); ASSERT_EQ(ret, 0); diff --git a/test/gtest/test_tle_tcp_stream.h b/test/gtest/test_tle_tcp_stream.h index 2caf2b5..80f0bea 100644 --- a/test/gtest/test_tle_tcp_stream.h +++ b/test/gtest/test_tle_tcp_stream.h @@ -32,6 +32,8 @@ #include "test_common.h" #define MAX_STREAMS 0x100 +#define MIN_STREAMS 0x10 +#define DELTA_STREAMS 0x20 #define MAX_STREAM_RBUFS 0x100 #define MAX_STREAM_SBUFS 0x100 #define RX_NO_OFFLOAD 0x0 @@ -41,6 +43,8 @@ static struct tle_ctx_param ctx_prm_tmpl = { .socket_id = SOCKET_ID_ANY, .proto = TLE_PROTO_TCP, .max_streams = MAX_STREAMS, + .min_streams = MIN_STREAMS, + .delta_streams = DELTA_STREAMS, .max_stream_rbufs = MAX_STREAM_RBUFS, .max_stream_sbufs = MAX_STREAM_SBUFS, }; diff --git a/test/gtest/test_tle_udp_destroy.cpp b/test/gtest/test_tle_udp_destroy.cpp index 2f26dd8..49306b5 100644 --- a/test/gtest/test_tle_udp_destroy.cpp +++ b/test/gtest/test_tle_udp_destroy.cpp @@ -24,6 +24,7 @@ TEST(udp_destroy_null, udp_destroy_null) TEST_F(udp_destroy, udp_destroy_positive) { int rc; + rte_errno = 0; tle_ctx_destroy(ctx); ASSERT_EQ(rte_errno, 0); } diff --git a/test/gtest/test_tle_udp_stream_gen.cpp b/test/gtest/test_tle_udp_stream_gen.cpp index 0f60b09..1007e4d 100644 --- a/test/gtest/test_tle_udp_stream_gen.cpp +++ b/test/gtest/test_tle_udp_stream_gen.cpp @@ -123,14 +123,13 @@ TEST_P(tle_rx_test, test) /* Receive packets until we reach end on pcap file*/ do { nb_rx = rte_eth_rx_burst(portid, 0, m, BURST_SIZE); - for(auto &d: tp.devs) { - memset(rc, 0, sizeof(int) * BURST_SIZE); - nb_rx_bulk = tle_udp_rx_bulk(d.ptr, m, rp, rc, nb_rx); - d.act_pkts_bulk_rx += nb_rx_bulk; - for(j = 0; j < BURST_SIZE; j++) { - if(rc[j] == ENOENT) - d.act_pkts_enoent += 1; - } + auto &d = tp.devs[0]; + memset(rc, 0, sizeof(int) * BURST_SIZE); + nb_rx_bulk = tle_udp_rx_bulk(d.ptr, m, rp, rc, nb_rx); + d.act_pkts_bulk_rx += nb_rx_bulk; + for(j = 0; j < BURST_SIZE; j++) { + if(rc[j] == ENOENT) + d.act_pkts_enoent += 1; } for(auto &s: tp.streams) { @@ -139,14 +138,12 @@ TEST_P(tle_rx_test, test) } } while (nb_rx > 0); - /* * Verify results - number of rx packets per dev and stream. */ - for(auto &d: tp.devs) { - EXPECT_EQ(d.act_pkts_bulk_rx, d.exp_pkts_bulk_rx); - EXPECT_EQ(d.act_pkts_enoent, d.exp_pkts_enoent); - } + auto &d = tp.devs[0]; + EXPECT_EQ(d.act_pkts_bulk_rx, d.exp_pkts_bulk_rx); + EXPECT_EQ(d.act_pkts_enoent, d.exp_pkts_enoent); for(auto &s: tp.streams) { EXPECT_EQ(s.act_pkts_rx, s.exp_pkts_rx); @@ -257,9 +254,9 @@ test_str * 3 dev, 3 stream per dev, only correct pkts */ "Mixed IPv4+IPv6; Multiple devs with multiple correct streams", { - {"10.0.0.1", "2001::1000",RX_NO_OFFLOAD, TX_NO_OFFLOAD, 300, 0, 600}, - {"20.0.0.1", "2002::1000", RX_NO_OFFLOAD, TX_NO_OFFLOAD, 300, 0, 600}, - {"30.0.0.1", "2003::1000", RX_NO_OFFLOAD, TX_NO_OFFLOAD, 300, 0, 600}, + {"10.0.0.1", "2001::1000",RX_NO_OFFLOAD, TX_NO_OFFLOAD, 900, 0, 0}, + {"20.0.0.1", "2002::1000", RX_NO_OFFLOAD, TX_NO_OFFLOAD, 900, 0, 0}, + {"30.0.0.1", "2003::1000", RX_NO_OFFLOAD, TX_NO_OFFLOAD, 900, 0, 0}, }, { {AF_INET, 10001, 10011, "10.0.0.1", "10.0.0.2", 100, 0}, @@ -268,20 +265,20 @@ test_str {AF_INET, 20001, 20011, "20.0.0.1", "20.0.0.2", 100, 0}, {AF_INET6, 20002, 20012, "2002::1000", "2002::3000", 100, 0}, {AF_INET6, 20003, 20013, "2002::1000", "2002::4000", 100, 0}, - {AF_INET, 20001, 20011, "30.0.0.1", "30.0.0.2", 100, 0}, - {AF_INET6, 20002, 20012, "2003::1000", "2003::3000", 100, 0}, - {AF_INET6, 20003, 20013, "2003::1000", "2003::4000", 100, 0} + {AF_INET, 30001, 30011, "30.0.0.1", "30.0.0.2", 100, 0}, + {AF_INET6, 30002, 30012, "2003::1000", "2003::3000", 100, 0}, + {AF_INET6, 30003, 30013, "2003::1000", "2003::4000", 100, 0} }, { {AF_INET, "10.0.0.2", "10.0.0.1", 10011, 10001, 100, 0, 0, 0}, {AF_INET, "10.0.0.3", "10.0.0.1", 10012, 10002, 100, 0, 0, 0}, {AF_INET, "20.0.0.2", "20.0.0.1", 20011, 20001, 100, 0, 0, 0}, - {AF_INET, "30.0.0.2", "30.0.0.1", 20011, 20001, 100, 0, 0, 0}, + {AF_INET, "30.0.0.2", "30.0.0.1", 30011, 30001, 100, 0, 0, 0}, {AF_INET6, "2001::4000", "2001::1000", 10013, 10003, 100, 0, 0, 0}, {AF_INET6, "2002::3000", "2002::1000", 20012, 20002, 100, 0, 0, 0}, {AF_INET6, "2002::4000", "2002::1000", 20013, 20003, 100, 0, 0, 0}, - {AF_INET6, "2003::3000", "2003::1000", 20012, 20002, 100, 0, 0, 0}, - {AF_INET6, "2003::4000", "2003::1000", 20013, 20003, 100, 0, 0, 0}, + {AF_INET6, "2003::3000", "2003::1000", 30012, 30002, 100, 0, 0, 0}, + {AF_INET6, "2003::4000", "2003::1000", 30013, 30003, 100, 0, 0, 0}, } } )); @@ -425,20 +422,20 @@ test_str {AF_INET, 20001, 20011, "20.0.0.1", "20.0.0.2", 0, 100}, {AF_INET6, 20002, 20012, "2002::1000", "2002::3000", 0, 100}, {AF_INET6, 20003, 20013, "2002::1000", "2002::4000", 0, 100}, - {AF_INET, 20001, 20011, "30.0.0.1", "30.0.0.2", 0, 100}, - {AF_INET6, 20002, 20012, "2003::1000", "2003::3000", 0, 100}, - {AF_INET6, 20003, 20013, "2003::1000", "2003::4000", 0, 100} + {AF_INET, 30001, 30011, "30.0.0.1", "30.0.0.2", 0, 100}, + {AF_INET6, 30002, 30012, "2003::1000", "2003::3000", 0, 100}, + {AF_INET6, 30003, 30013, "2003::1000", "2003::4000", 0, 100} }, { {AF_INET, "10.0.0.2", "10.0.0.1", 10011, 10001, 100, 0, 0, 0}, {AF_INET, "10.0.0.3", "10.0.0.1", 10012, 10002, 100, 0, 0, 0}, {AF_INET, "20.0.0.2", "20.0.0.1", 20011, 20001, 100, 0, 0, 0}, - {AF_INET, "30.0.0.2", "30.0.0.1", 20011, 20001, 100, 0, 0, 0}, + {AF_INET, "30.0.0.2", "30.0.0.1", 30011, 30001, 100, 0, 0, 0}, {AF_INET6, "2001::4000", "2001::1000", 10013, 10003, 100, 0, 0, 0}, {AF_INET6, "2002::3000", "2002::1000", 20012, 20002, 100, 0, 0, 0}, {AF_INET6, "2002::4000", "2002::1000", 20013, 20003, 100, 0, 0, 0}, - {AF_INET6, "2003::3000", "2003::1000", 20012, 20002, 100, 0, 0, 0}, - {AF_INET6, "2003::4000", "2003::1000", 20013, 20003, 100, 0, 0, 0}, + {AF_INET6, "2003::3000", "2003::1000", 30012, 30002, 100, 0, 0, 0}, + {AF_INET6, "2003::4000", "2003::1000", 30013, 30003, 100, 0, 0, 0}, } } )); diff --git a/test/gtest/test_tle_udp_stream_gen.h b/test/gtest/test_tle_udp_stream_gen.h index 1f3d210..eb92385 100644 --- a/test/gtest/test_tle_udp_stream_gen.h +++ b/test/gtest/test_tle_udp_stream_gen.h @@ -379,6 +379,8 @@ test_tle_udp_gen_base::setup_ctx(void) memset(&ctx_prm, 0, sizeof(ctx_prm)); ctx_prm.socket_id = SOCKET_ID_ANY; ctx_prm.max_streams = 0x10; + ctx_prm.min_streams = 0x8; + ctx_prm.delta_streams = 0x8; ctx_prm.max_stream_rbufs = CTX_MAX_RBUFS; ctx_prm.max_stream_sbufs = CTX_MAX_SBUFS; ctx_prm.lookup4 = lookup4_function; |