From patchwork Thu Jun 25 14:42:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 50330 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 219D2228FC for ; Thu, 25 Jun 2015 14:45:26 +0000 (UTC) Received: by laer2 with SMTP id r2sf19708254lae.3 for ; Thu, 25 Jun 2015 07:45:25 -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=4IuuDH4Xs7isF1TnjdXxtTkKeKQlkz5sh5PyHuvDsZk=; b=klnLaXQqMKlLSuJqJVjEVnuaTTC78uumjM9MV9Jltod9ij7B544ICpdY+diSBH8rBu 8mTXeB6Z3nZ0xhHSGYP6Yt9gKpTc8T9SmHay5+eu8SzToNgLDK9fe1iGxkR7DjGfTaW+ KyL6rNMjIB7xQ1+X0rAJoOSFqSaYVQ83ram+u2zRJlZOWmUdJ3/6y+rl+cnt+1i+fySH mSY5SGPC4N7wRXOxkcIv/THgcK025AWTGC02XCZzJnlbyB4UARPrAIohR1XQQTF35Di5 EFxsTrWwPLRdW+4q0Cgxraov8geprndmxrnXd05TPyx8K4O4/F/XrzMCz/ASoBDHO88M c8vA== X-Gm-Message-State: ALoCoQkYgpkZ9mQQ2rGs9AZEapv4b+mQ3dCP5QlsmNANE7CzaPCJDYVwBdDvjhmXD9E7Ru92zZbw X-Received: by 10.112.28.111 with SMTP id a15mr39714423lbh.21.1435243525095; Thu, 25 Jun 2015 07:45:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.4 with SMTP id x4ls363018lag.100.gmail; Thu, 25 Jun 2015 07:45:24 -0700 (PDT) X-Received: by 10.152.87.148 with SMTP id ay20mr23153319lab.45.1435243524939; Thu, 25 Jun 2015 07:45:24 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id db3si24831333lad.150.2015.06.25.07.45.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jun 2015 07:45:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbbvz5 with SMTP id vz5so47006898lbb.0 for ; Thu, 25 Jun 2015 07:45:24 -0700 (PDT) X-Received: by 10.112.220.7 with SMTP id ps7mr44715528lbc.72.1435243524496; Thu, 25 Jun 2015 07:45:24 -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 hn6csp655476lbb; Thu, 25 Jun 2015 07:45:23 -0700 (PDT) X-Received: by 10.55.41.158 with SMTP id p30mr50995504qkp.16.1435243523005; Thu, 25 Jun 2015 07:45:23 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id i35si29509583qgd.126.2015.06.25.07.45.20; Thu, 25 Jun 2015 07:45:22 -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 75BB661E82; Thu, 25 Jun 2015 14:45:20 +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 1B07461E73; Thu, 25 Jun 2015 14:43:15 +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 1F37361E27; Thu, 25 Jun 2015 14:43:08 +0000 (UTC) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com [209.85.215.48]) by lists.linaro.org (Postfix) with ESMTPS id 7521061E56 for ; Thu, 25 Jun 2015 14:42:39 +0000 (UTC) Received: by laka10 with SMTP id a10so46460863lak.0 for ; Thu, 25 Jun 2015 07:42:38 -0700 (PDT) X-Received: by 10.152.234.42 with SMTP id ub10mr36912292lac.60.1435243358479; Thu, 25 Jun 2015 07:42: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 lb8sm4057655lab.16.2015.06.25.07.42.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jun 2015 07:42:37 -0700 (PDT) From: Christophe Milard To: anders.roxell@linaro.org, mike.holmes@linaro.org, stuart.haslam@linaro.org, maxim.uvarov@linaro.org Date: Thu, 25 Jun 2015 16:42:17 +0200 Message-Id: <1435243338-29958-4-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1435243338-29958-1-git-send-email-christophe.milard@linaro.org> References: <1435243338-29958-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Cc: lng-odp@lists.linaro.org Subject: [lng-odp] [PATCHv2 3/4] validation: creating own dir and lib for pool 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.217.172 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 poll 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/pool/.gitignore | 2 ++ test/validation/pool/Makefile.am | 8 ++++++++ test/validation/{odp_pool.c => pool/pool.c} | 9 ++------- test/validation/pool/pool.h | 7 +++++++ test/validation/pool/pool_main.c | 12 ++++++++++++ 8 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 test/validation/pool/.gitignore create mode 100644 test/validation/pool/Makefile.am rename test/validation/{odp_pool.c => pool/pool.c} (96%) create mode 100644 test/validation/pool/pool.h create mode 100644 test/validation/pool/pool_main.c diff --git a/configure.ac b/configure.ac index 2aa804d..b72df2e 100644 --- a/configure.ac +++ b/configure.ac @@ -308,6 +308,7 @@ AC_CONFIG_FILES([Makefile test/validation/crypto/Makefile test/validation/init/Makefile test/validation/pktio/Makefile + test/validation/pool/Makefile test/validation/queue/Makefile test/validation/random/Makefile test/validation/system/Makefile diff --git a/test/validation/.gitignore b/test/validation/.gitignore index a8faaa2..cf8c044 100644 --- a/test/validation/.gitignore +++ b/test/validation/.gitignore @@ -4,7 +4,6 @@ odp_ver_abt_log_dbg odp_buffer odp_cpumask odp_packet -odp_pool odp_scheduler odp_shared_memory odp_synchronizers diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index b0e577c..ff88a68 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -7,7 +7,6 @@ AM_LDFLAGS += -static EXECUTABLES = odp_buffer \ odp_cpumask \ odp_packet \ - odp_pool \ odp_scheduler \ odp_shared_memory \ odp_synchronizers \ @@ -16,7 +15,8 @@ EXECUTABLES = odp_buffer \ odp_ver_abt_log_dbg if test_vald -TESTS = $(EXECUTABLES) +TESTS = $(EXECUTABLES) \ + pool/pool_main endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) @@ -33,9 +33,6 @@ dist_odp_shared_memory_SOURCES = odp_shared_memory.c dist_odp_synchronizers_SOURCES = odp_synchronizers.c dist_odp_timer_SOURCES = odp_timer.c dist_odp_packet_SOURCES = odp_packet.c -odp_pool_LDADD = $(top_builddir)/test/validation/common/libcunit_common.a \ - $(LIB)/libodp.la -dist_odp_pool_SOURCES = odp_pool.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 @@ -48,6 +45,7 @@ ODP_MODULES = classification \ init \ queue \ pktio \ + pool \ random \ system diff --git a/test/validation/pool/.gitignore b/test/validation/pool/.gitignore new file mode 100644 index 0000000..2c67c9f --- /dev/null +++ b/test/validation/pool/.gitignore @@ -0,0 +1,2 @@ +libpool.a +pool_main diff --git a/test/validation/pool/Makefile.am b/test/validation/pool/Makefile.am new file mode 100644 index 0000000..54fb4ac --- /dev/null +++ b/test/validation/pool/Makefile.am @@ -0,0 +1,8 @@ +include ../Makefile.inc + +noinst_LIBRARIES = libpool.a +libpool_a_SOURCES = pool.c + +bin_PROGRAMS = pool_main +dist_pool_main_SOURCES = pool_main.c +pool_main_LDADD = libpool.a $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/odp_pool.c b/test/validation/pool/pool.c similarity index 96% rename from test/validation/odp_pool.c rename to test/validation/pool/pool.c index ba5dc79..1b54033 100644 --- a/test/validation/odp_pool.c +++ b/test/validation/pool/pool.c @@ -6,6 +6,7 @@ #include #include "odp_cunit_common.h" +#include "pool.h" static int pool_name_number = 1; static const int default_buffer_size = 1500; @@ -143,13 +144,7 @@ static CU_SuiteInfo pool_suites[] = { CU_SUITE_INFO_NULL, }; -static int pool_main(void) +int pool_main(void) { return odp_cunit_run(pool_suites); } - -/* the following main function will be separated when lib is created */ -int main(void) -{ - return pool_main(); -} diff --git a/test/validation/pool/pool.h b/test/validation/pool/pool.h new file mode 100644 index 0000000..53cd4d1 --- /dev/null +++ b/test/validation/pool/pool.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +int pool_main(void); diff --git a/test/validation/pool/pool_main.c b/test/validation/pool/pool_main.c new file mode 100644 index 0000000..5ef739e --- /dev/null +++ b/test/validation/pool/pool_main.c @@ -0,0 +1,12 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "pool.h" + +int main(void) +{ + return pool_main(); +}