aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorBill Fischofer <bill.fischofer@linaro.org>2018-01-19 09:21:22 -0600
committerMaxim Uvarov <maxim.uvarov@linaro.org>2018-02-26 13:38:44 +0300
commit8b314af0c2e51650b5092c4d7815d1ceb70caeba (patch)
tree53757e2d668b6c3d1a7a88569635a0b5dad31a2d /test
parent609d05fbcad23eec9bf41bb5b40776df200a3efd (diff)
test: validation: drop use of indefinite wait in pktio test
Drop use of deprecated ODP_PKTIN_WAIT timeout option in pktio tests. Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen@linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'test')
-rw-r--r--test/validation/api/pktio/pktio.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c
index 884292fa8..ecab44489 100644
--- a/test/validation/api/pktio/pktio.c
+++ b/test/validation/api/pktio/pktio.c
@@ -553,10 +553,8 @@ static int recv_packets_tmo(odp_pktio_t pktio, odp_packet_t pkt_tbl[],
CU_ASSERT(from_val < (unsigned)num_q);
} while (num_rx < num);
- if (tmo == ODP_PKTIN_WAIT)
- CU_ASSERT(num_rx == num);
if (num_rx < num)
- CU_ASSERT(odp_time_to_ns(odp_time_diff(ts2, ts1)) >= ns);
+ CU_ASSERT(odp_time_diff_ns(ts2, ts1) >= ns);
return num_rx;
}
@@ -980,7 +978,7 @@ static void test_recv_tmo(recv_tmo_mode_e mode)
CU_ASSERT_FATAL(ret == test_pkt_count);
ret = recv_packets_tmo(pktio_rx, &pkt_tbl[0], &pkt_seq[0], 1, mode,
- ODP_PKTIN_WAIT, 0);
+ odp_pktin_wait_time(UINT64_MAX), 0);
CU_ASSERT_FATAL(ret == 1);
ret = recv_packets_tmo(pktio_rx, &pkt_tbl[1], &pkt_seq[1], 1, mode,