This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via eaf3b566293fa2bc10bb5b99b38ad75f4914b1ab (commit) from 0ebd57ab0ea8e1a95cdb8a564fcaec4cad6231e7 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit eaf3b566293fa2bc10bb5b99b38ad75f4914b1ab Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Tue Jun 26 23:52:35 2018 +0300
validatation: fix tm wred test under loaded system
Fix following bug with skipping test result is CI env variable was set. Test failed at line 3139 in file traffic_mngr.c : (wred_pkt_cnts->min_cnt <= pkts_sent) && (pkts_sent <= wred_pkt_cnts->max_cnt)
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org
diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c index db6a16af..9b9e73b7 100644 --- a/test/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/validation/api/traffic_mngr/traffic_mngr.c @@ -3070,6 +3070,7 @@ static int test_byte_wred(const char *wred_name, odp_tm_queue_t tm_queue; pkt_info_t pkt_info; uint32_t num_fill_pkts, num_test_pkts, pkts_sent; + int ret;
/* Pick the tm_queue and set the tm_queue's wred profile to drop the * given percentage of traffic, then send 100 pkts and see how many @@ -3131,13 +3132,13 @@ static int test_byte_wred(const char *wred_name, flush_leftover_pkts(odp_tm_systems[0], rcv_pktin); CU_ASSERT(odp_tm_is_idle(odp_tm_systems[0]));
- if ((wred_pkt_cnts->min_cnt <= pkts_sent) && - (pkts_sent <= wred_pkt_cnts->max_cnt)) - return 0; - - CU_ASSERT((wred_pkt_cnts->min_cnt <= pkts_sent) && - (pkts_sent <= wred_pkt_cnts->max_cnt)); - return 0; + ret = !((wred_pkt_cnts->min_cnt <= pkts_sent) && + (pkts_sent <= wred_pkt_cnts->max_cnt)); + if (ret) + LOG_DBG("min %" PRIu32 " pkts %" PRIu32" max %" PRIu32 "\n", + wred_pkt_cnts->min_cnt, pkts_sent, + wred_pkt_cnts->max_cnt); + return odp_cunit_ret(ret); }
static int test_pkt_wred(const char *wred_name,
-----------------------------------------------------------------------
Summary of changes: test/validation/api/traffic_mngr/traffic_mngr.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
hooks/post-receive