From patchwork Mon Sep 12 20:48:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 76028 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp1037291qgf; Mon, 12 Sep 2016 13:48:19 -0700 (PDT) X-Received: by 10.200.55.221 with SMTP id e29mr6298103qtc.29.1473713299592; Mon, 12 Sep 2016 13:48:19 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id u65si12437655qkb.94.2016.09.12.13.48.17; Mon, 12 Sep 2016 13:48:19 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B1E6C60E33; Mon, 12 Sep 2016 20:48:17 +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, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL 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 DB15860F03; Mon, 12 Sep 2016 20:48:12 +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 E58A160F39; Mon, 12 Sep 2016 20:48:10 +0000 (UTC) Received: from mail-oi0-f53.google.com (mail-oi0-f53.google.com [209.85.218.53]) by lists.linaro.org (Postfix) with ESMTPS id BF16160E33 for ; Mon, 12 Sep 2016 20:48:09 +0000 (UTC) Received: by mail-oi0-f53.google.com with SMTP id y2so335448244oie.0 for ; Mon, 12 Sep 2016 13:48:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=lK4TBvsnP3eKz8P/OM1QV8nJwF3qNHBBKNXIwIDsMjk=; b=JV/a+7W6rCUFz6C4w9+1wKXa8snUc6e39zKBscXU6kytXEFXsFZfKlyrr1KQn7/NP1 M0XWbx+5LEynlfREDuyr5iYM5y4/ZK0qt82cPhc1o9+5jJ7dJi0r/WDNCt9IkNdXPpcw iUAxh8Dzwb2s/cieLBCyd62P3P6SrNfVviPJya6lxh3GPSorLpwti/7S/d3zWFQRZoRU FbKo6va0VuIZQMLQb/RqMF6E1Ypy7ETjyjh7VIi3UXEekkkN9dgEUIuFXZGssF+qFoT/ xGLlaJc/3lD0BOafS93kL1AoyH6HvOd4wbRqYlNkV/UitAjhncdHE+e+oYubRnnZxaFr ZJ5A== X-Gm-Message-State: AE9vXwPqMF138X4eOWqTolXWSAiyiH7v/WWcoDOORiagjvCLy1ViFGV5LkqWiOpP7bodt/byit0= X-Received: by 10.202.81.2 with SMTP id f2mr1496675oib.38.1473713289173; Mon, 12 Sep 2016 13:48:09 -0700 (PDT) Received: from localhost.localdomain (cpe-70-121-83-241.austin.res.rr.com. [70.121.83.241]) by smtp.gmail.com with ESMTPSA id w78sm885021oiw.17.2016.09.12.13.48.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Sep 2016 13:48:08 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Mon, 12 Sep 2016 15:48:05 -0500 Message-Id: <1473713285-16787-1-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.7.4 X-Topics: patch Subject: [lng-odp] [PATCH] validation: packet: remove todos from packet tests 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" Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2405 by removing todos in packet validation test. Add additional tests for todos that can be resolved within current ODP API set and remove the rest to be deferred for latest updates. Signed-off-by: Bill Fischofer --- test/common_plat/validation/api/packet/packet.c | 56 ++++++++++++------------- 1 file changed, 28 insertions(+), 28 deletions(-) -- 2.7.4 Reviewed-by: Mike Holmes diff --git a/test/common_plat/validation/api/packet/packet.c b/test/common_plat/validation/api/packet/packet.c index a4426e2..c75cde9 100644 --- a/test/common_plat/validation/api/packet/packet.c +++ b/test/common_plat/validation/api/packet/packet.c @@ -32,6 +32,28 @@ static struct udata_struct { "abcdefg", }; +static void _packet_compare_data(odp_packet_t pkt1, odp_packet_t pkt2) +{ + uint32_t len = odp_packet_len(pkt1); + uint32_t offset = 0; + uint32_t seglen1, seglen2, cmplen; + + CU_ASSERT_FATAL(len == odp_packet_len(pkt2)); + + while (len > 0) { + void *pkt1map = odp_packet_offset(pkt1, offset, &seglen1, NULL); + void *pkt2map = odp_packet_offset(pkt2, offset, &seglen2, NULL); + + CU_ASSERT_PTR_NOT_NULL_FATAL(pkt1map); + CU_ASSERT_PTR_NOT_NULL_FATAL(pkt2map); + cmplen = seglen1 < seglen2 ? seglen1 : seglen2; + CU_ASSERT(!memcmp(pkt1map, pkt2map, cmplen)); + + offset += cmplen; + len -= cmplen; + } +} + int packet_suite_init(void) { odp_pool_param_t params; @@ -298,7 +320,8 @@ void packet_test_event_conversion(void) tmp_pkt = odp_packet_from_event(ev); CU_ASSERT_FATAL(tmp_pkt != ODP_PACKET_INVALID); - /** @todo: Need an API to compare packets */ + CU_ASSERT(tmp_pkt == pkt); + _packet_compare_data(tmp_pkt, pkt); } void packet_test_basic_metadata(void) @@ -502,7 +525,7 @@ void packet_test_headroom(void) seg_data_len = odp_packet_seg_len(pkt); CU_ASSERT(seg_data_len >= 1); - /** @todo: should be len - 1 */ + pull_val = seg_data_len / 2; push_val = room; @@ -625,7 +648,7 @@ void packet_test_tailroom(void) seg_data_len = odp_packet_seg_data_len(pkt, segment); CU_ASSERT(seg_data_len >= 1); - /** @todo: should be len - 1 */ + pull_val = seg_data_len / 2; /* Leave one byte in a tailroom for odp_packet_tail() to succeed */ push_val = (room > 0) ? room - 1 : room; @@ -681,10 +704,10 @@ void packet_test_segments(void) CU_ASSERT_PTR_NOT_NULL(seg_data); CU_ASSERT(odp_packet_seg_to_u64(seg) != odp_packet_seg_to_u64(ODP_PACKET_SEG_INVALID)); + CU_ASSERT(odp_memcmp(seg_data, seg_data, seg_data_len) == 0); data_len += seg_data_len; - /** @todo: touch memory in a segment */ seg_index++; seg = odp_packet_next_seg(pkt, seg); } @@ -713,10 +736,10 @@ void packet_test_segments(void) CU_ASSERT(seg_data != NULL); CU_ASSERT(odp_packet_seg_to_u64(seg) != odp_packet_seg_to_u64(ODP_PACKET_SEG_INVALID)); + CU_ASSERT(odp_memcmp(seg_data, seg_data, seg_data_len) == 0); data_len += seg_data_len; - /** @todo: touch memory in a segment */ seg_index++; seg = odp_packet_next_seg(seg_pkt, seg); } @@ -784,7 +807,6 @@ void packet_test_error_flags(void) /** * The packet have not been classified so it doesn't have error flags * properly set. Just check that functions return one of allowed values. - * @todo: try with known good and bad packets. */ err = odp_packet_has_error(pkt); CU_ASSERT(err == 0 || err == 1); @@ -922,28 +944,6 @@ static void _packet_compare_inflags(odp_packet_t pkt1, odp_packet_t pkt2) COMPARE_INFLAG(pkt1, pkt2, shaper_len_adjust); } -static void _packet_compare_data(odp_packet_t pkt1, odp_packet_t pkt2) -{ - uint32_t len = odp_packet_len(pkt1); - uint32_t offset = 0; - uint32_t seglen1, seglen2, cmplen; - - CU_ASSERT_FATAL(len == odp_packet_len(pkt2)); - - while (len > 0) { - void *pkt1map = odp_packet_offset(pkt1, offset, &seglen1, NULL); - void *pkt2map = odp_packet_offset(pkt2, offset, &seglen2, NULL); - - CU_ASSERT_PTR_NOT_NULL_FATAL(pkt1map); - CU_ASSERT_PTR_NOT_NULL_FATAL(pkt2map); - cmplen = seglen1 < seglen2 ? seglen1 : seglen2; - CU_ASSERT(!memcmp(pkt1map, pkt2map, cmplen)); - - offset += cmplen; - len -= cmplen; - } -} - static void _packet_compare_udata(odp_packet_t pkt1, odp_packet_t pkt2) { uint32_t usize1 = odp_packet_user_area_size(pkt1);