From patchwork Fri Jan 19 16:00:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125187 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp354547ljf; Fri, 19 Jan 2018 08:01:30 -0800 (PST) X-Google-Smtp-Source: ACJfBouhBOSUk1SWf8noz/2gcnAMo5L2JWNzjgjVUe2MTEaupQiI1BR11EFZuDaW/3RIj1fWSHWJ X-Received: by 10.129.98.65 with SMTP id w62mr7623872ywb.438.1516377690694; Fri, 19 Jan 2018 08:01:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516377690; cv=none; d=google.com; s=arc-20160816; b=SWDdYmLtwbwSGaFuMh1r76qTPiy3pi+Alz98GKdV4m89W0bZT0usk29H51GAUxzK55 L3sr1v2cWao47uorGDoXTKccIOwiRAQF7wGtyflWHz00WWEjYxu62fa16FFFO5J0W+kQ z3K+nzvhPBlBTBGvUPxCfsJRbZGn7jzaSGX07O/YtJ4mMvLekqNbIF1Ju9EknQh79/K1 7cW79ecGFNZbj4CS88aNoqWTXT+Js5b7yfL8ErGCxABQSt0Je/oXwUY+aKd8JEndcNnO 5e/efKjeydspwkxu6paE4k1XlycKx/1oP3u8Iw/wvkbar52LBOc+KNs+NjxomKQkkONn ShMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=3C314TfD5bwGBfwxrhENkP03jGIkhL54L0KjLN9aCsE=; b=C1sr6JJRcPezbP9dgFgAOYwbixgU3adnLM71553GdPcGLy0wVOU3E1gisQZWUhkF9W i002T7L4mV9utK6DfqJfaqkYtq+BObItrGdPZYdJedCBTfsnE6bggrxIu9mCeJ9dd31e 8MiFC+tcBCiYJECS6c4R/F23hzeukU9ffHZGAmN3AhjS964LvnFgtSU72gbbPqm343gF YhiTZ91iBJap++h3c4IqzHwv2sU/pNAKPXvhqxDUgOkvpWeBC73N1FVIJuapOQwbzCRI KG199kBlImUD5sEA5o6FShpvZ4+DlzkUjbeEyg+KM029oXvt+wbTMKgaQbITGkdJGZiD OwqA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id n71si3557072qkl.221.2018.01.19.08.01.30; Fri, 19 Jan 2018 08:01:30 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 3AD48627F6; Fri, 19 Jan 2018 16:01:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 10C076277D; Fri, 19 Jan 2018 16:00:51 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 9F8166170E; Fri, 19 Jan 2018 16:00:42 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 2A9F26170E for ; Fri, 19 Jan 2018 16:00:41 +0000 (UTC) Received: from mxback13g.mail.yandex.net (mxback13g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:92]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 80BD65D84121 for ; Fri, 19 Jan 2018 19:00:39 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback13g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id urlnRLH1JL-0dVapKan; Fri, 19 Jan 2018 19:00:39 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id L1KkttjRid-0ceqRFPE; Fri, 19 Jan 2018 19:00:38 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 19 Jan 2018 19:00:19 +0300 Message-Id: <1516377621-1467-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516377621-1467-1-git-send-email-odpbot@yandex.ru> References: <1516377621-1467-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 410 Subject: [lng-odp] [PATCH API-NEXT v1 1/3] test: validation: drop use of indefinite wait in pktio test X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Bill Fischofer Drop use of deprecated ODP_PKTIN_WAIT timeout option in pktio tests. Signed-off-by: Bill Fischofer --- /** Email created from pull request 410 (Bill-Fischofer-Linaro:pktio-dropwait) ** https://github.com/Linaro/odp/pull/410 ** Patch: https://github.com/Linaro/odp/pull/410.patch ** Base sha: e77675624b9cfcd6ea83d11804ed0715b7fad2ec ** Merge commit sha: 203a819ff5a42c5c91240db386f4759a47813c99 **/ test/validation/api/pktio/pktio.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index c144294b5..9cd111d38 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -554,10 +554,7 @@ 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(num_rx == num || odp_time_diff_ns(ts2, ts1) >= ns); return num_rx; } @@ -981,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); + UINT64_MAX, 0); CU_ASSERT_FATAL(ret == 1); ret = recv_packets_tmo(pktio_rx, &pkt_tbl[1], &pkt_seq[1], 1, mode,