From patchwork Mon Jun 29 12:48:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 50411 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8D5B6218E4 for ; Mon, 29 Jun 2015 12:51:51 +0000 (UTC) Received: by wiar9 with SMTP id r9sf13405026wia.1 for ; Mon, 29 Jun 2015 05:51:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:errors-to :sender:x-original-sender:x-original-authentication-results :mailing-list; bh=8/9sl7GN5B8DDtgU3Rh/xcqWtIRtfeH7cOiSBI5lqQY=; b=MRGdHUeq37KeCDFGWkrn/hImdTcrSPKseJuVyyB+r9kGt3lVAld3iPYwmP+KlilQMP 4Bmz7e65ZbPTxCMUNRAF3TrBM+8sRvcXj6J/Zmu0MX+oLroCIPBdM3BUKYd9NmSe+EUr vV9yPydK9oIxr7CyCnXPHRGry+YHKYUafw+AtnSUcOBBfbXTBzrxo/UrrKrKOsx8FsAl F8PGRvPO1Ny9a13CWXeI287120hpdZxz6XyCV5195goFKJ1abEZfbBtQ9HHwoLoOJnro 2vtf94aAZbUjxiB62h7e2q6jjcyRDviiKrnEyYtQX/rp8ERBmaWrBHAQsyfbSmBbvGKK 49iQ== X-Gm-Message-State: ALoCoQnaT1XjFgbYLsEUsvihRxnCmT1XrLHNPzRVyZLSrPr6bzUIQ0f01k99lW1Um90V2yX+e07v X-Received: by 10.112.9.100 with SMTP id y4mr10858258lba.20.1435582310785; Mon, 29 Jun 2015 05:51:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.25.134 with SMTP id c6ls405497lag.54.gmail; Mon, 29 Jun 2015 05:51:50 -0700 (PDT) X-Received: by 10.152.23.38 with SMTP id j6mr13588504laf.47.1435582310497; Mon, 29 Jun 2015 05:51:50 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id db5si13442794lac.73.2015.06.29.05.51.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jun 2015 05:51:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by laar3 with SMTP id r3so62158537laa.0 for ; Mon, 29 Jun 2015 05:51:50 -0700 (PDT) X-Received: by 10.153.5.38 with SMTP id cj6mr13950345lad.36.1435582310362; Mon, 29 Jun 2015 05:51:50 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1684779lbb; Mon, 29 Jun 2015 05:51:49 -0700 (PDT) X-Received: by 10.140.93.199 with SMTP id d65mr18688348qge.27.1435582308659; Mon, 29 Jun 2015 05:51:48 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id p24si24477641qkh.33.2015.06.29.05.51.47; Mon, 29 Jun 2015 05:51:48 -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; Received: by lists.linaro.org (Postfix, from userid 109) id CAD6D61C89; Mon, 29 Jun 2015 12:51:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252.ec2.internal 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, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from ip-10-142-244-252.ec2.internal (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 62F4B61DD0; Mon, 29 Jun 2015 12:49:35 +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 E0AF661DDA; Mon, 29 Jun 2015 12:49:29 +0000 (UTC) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com [209.85.215.41]) by lists.linaro.org (Postfix) with ESMTPS id 6B95061DDB for ; Mon, 29 Jun 2015 12:48:40 +0000 (UTC) Received: by lagh6 with SMTP id h6so52204104lag.2 for ; Mon, 29 Jun 2015 05:48:39 -0700 (PDT) X-Received: by 10.152.9.137 with SMTP id z9mr14089171laa.68.1435582118941; Mon, 29 Jun 2015 05:48:38 -0700 (PDT) Received: from erachmi-VirtualBox.ki.sw.ericsson.se (c-83-233-90-46.cust.bredband2.com. [83.233.90.46]) by mx.google.com with ESMTPSA id w7sm10798397lag.42.2015.06.29.05.48.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Jun 2015 05:48:38 -0700 (PDT) From: Christophe Milard To: anders.roxell@linaro.org, mike.holmes@linaro.org, stuart.haslam@linaro.org, maxim.uvarov@linaro.org Date: Mon, 29 Jun 2015 14:48:20 +0200 Message-Id: <1435582101-18831-5-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1435582101-18831-1-git-send-email-christophe.milard@linaro.org> References: <1435582101-18831-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Cc: lng-odp@lists.linaro.org Subject: [lng-odp] [PATCHv2 4/5] validation: creating own dir and lib for packet X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: christophe.milard@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Module packet now gets its own directory and create its own lib (currentely only containing its executable) Signed-off-by: Christophe Milard --- configure.ac | 1 + test/validation/.gitignore | 1 - test/validation/Makefile.am | 8 +++----- test/validation/packet/.gitignore | 2 ++ test/validation/packet/Makefile.am | 8 ++++++++ test/validation/{odp_packet.c => packet/packet.c} | 9 ++------- test/validation/packet/packet.h | 7 +++++++ test/validation/packet/packet_main.c | 12 ++++++++++++ 8 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 test/validation/packet/.gitignore create mode 100644 test/validation/packet/Makefile.am rename test/validation/{odp_packet.c => packet/packet.c} (99%) create mode 100644 test/validation/packet/packet.h create mode 100644 test/validation/packet/packet_main.c diff --git a/configure.ac b/configure.ac index b72df2e..67f3799 100644 --- a/configure.ac +++ b/configure.ac @@ -307,6 +307,7 @@ AC_CONFIG_FILES([Makefile test/validation/common/Makefile test/validation/crypto/Makefile test/validation/init/Makefile + test/validation/packet/Makefile test/validation/pktio/Makefile test/validation/pool/Makefile test/validation/queue/Makefile diff --git a/test/validation/.gitignore b/test/validation/.gitignore index cf8c044..5346297 100644 --- a/test/validation/.gitignore +++ b/test/validation/.gitignore @@ -3,7 +3,6 @@ odp_ver_abt_log_dbg odp_buffer odp_cpumask -odp_packet odp_scheduler odp_shared_memory odp_synchronizers diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index 2ce00a0..4b158a3 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -6,7 +6,6 @@ AM_LDFLAGS += -static EXECUTABLES = odp_buffer \ odp_cpumask \ - odp_packet \ odp_scheduler \ odp_shared_memory \ odp_synchronizers \ @@ -15,7 +14,8 @@ EXECUTABLES = odp_buffer \ odp_ver_abt_log_dbg if test_vald -TESTS = $(EXECUTABLES) +TESTS = $(EXECUTABLES) \ + packet/packet_main endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) @@ -31,9 +31,6 @@ dist_odp_scheduler_SOURCES = odp_scheduler.c dist_odp_shared_memory_SOURCES = odp_shared_memory.c dist_odp_synchronizers_SOURCES = odp_synchronizers.c dist_odp_timer_SOURCES = odp_timer.c -odp_packet_LDADD = $(top_builddir)/test/validation/common/libcunit_common.a \ - $(LIB)/libodp.la -dist_odp_packet_SOURCES = odp_packet.c dist_odp_cpumask_SOURCES = odp_cpumask.c dist_odp_thread_SOURCES = odp_thread.c odp_ver_abt_log_dbg_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/ver_abt_log_dbg @@ -45,6 +42,7 @@ ODP_MODULES = classification \ crypto \ init \ queue \ + packet \ pktio \ pool \ random \ diff --git a/test/validation/packet/.gitignore b/test/validation/packet/.gitignore new file mode 100644 index 0000000..36fb9d3 --- /dev/null +++ b/test/validation/packet/.gitignore @@ -0,0 +1,2 @@ +libpacket.a +packet_main diff --git a/test/validation/packet/Makefile.am b/test/validation/packet/Makefile.am new file mode 100644 index 0000000..fdecb0d --- /dev/null +++ b/test/validation/packet/Makefile.am @@ -0,0 +1,8 @@ +include ../Makefile.inc + +noinst_LIBRARIES = libpacket.a +libpacket_a_SOURCES = packet.c + +bin_PROGRAMS = packet_main +dist_packet_main_SOURCES = packet_main.c +packet_main_LDADD = libpacket.a $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/odp_packet.c b/test/validation/packet/packet.c similarity index 99% rename from test/validation/odp_packet.c rename to test/validation/packet/packet.c index eb8e615..619d5b4 100644 --- a/test/validation/odp_packet.c +++ b/test/validation/packet/packet.c @@ -8,6 +8,7 @@ #include #include "odp_cunit_common.h" +#include "packet.h" /* Helper macro for CU_TestInfo initialization */ #define _CU_TEST_INFO(test_func) {#test_func, test_func} @@ -731,13 +732,7 @@ static CU_SuiteInfo packet_suites[] = { CU_SUITE_INFO_NULL, }; -static int packet_main(void) +int packet_main(void) { return odp_cunit_run(packet_suites); } - -/* the following main function will be separated when lib is created */ -int main(void) -{ - return packet_main(); -} diff --git a/test/validation/packet/packet.h b/test/validation/packet/packet.h new file mode 100644 index 0000000..421bc25 --- /dev/null +++ b/test/validation/packet/packet.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +int packet_main(void); diff --git a/test/validation/packet/packet_main.c b/test/validation/packet/packet_main.c new file mode 100644 index 0000000..90972fd --- /dev/null +++ b/test/validation/packet/packet_main.c @@ -0,0 +1,12 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "packet.h" + +int main(void) +{ + return packet_main(); +}