From patchwork Fri Jul 3 14:27:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 50635 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D886922916 for ; Fri, 3 Jul 2015 14:29:25 +0000 (UTC) Received: by wiwz6 with SMTP id z6sf33529681wiw.0 for ; Fri, 03 Jul 2015 07:29: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=CLNsQV5Vpca8iH6UfLxlfdVpcAEZgj4JAmMdxu7fRXk=; b=apV5vm7LNNi+62p5doyVEgmAuDndMevsOR5P05GbC6D+l7sFytXALFjKJ4A76nsmAA Qu/dvp4ynmKqYC265bt9fPNsd898BxADQAM5ZJAGENmSGoqyaJzY0ru93NhBWTCBStNq vETKARU+eMCZzoIgIZcp6jDXt6qaV9KrIgBrCaD7DDy9TkoqolcTVtS4SanefC8GHMZU Vmv7Fw1njQmYBdCC2YnFkhMbjIFqkYTWNOc9/CgLfpNXVvr4WiOZX8556ebSqRJW/N1D kXmtDmDhJxcxwLcUmgwGHFWOOKjx3MXk7ITCOhwDIZY8RkkhVXx7N1OW3cyz+L+X0nh1 LnSQ== X-Gm-Message-State: ALoCoQmBKrbjRJfgrhYler09WHm6qPpvatb9BQGRsMT9K+0OUvM9Ypm7FmxQCbwdiX2K8oFKwbzw X-Received: by 10.112.42.236 with SMTP id r12mr23002901lbl.2.1435933765099; Fri, 03 Jul 2015 07:29:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.4 with SMTP id x4ls491667lag.100.gmail; Fri, 03 Jul 2015 07:29:24 -0700 (PDT) X-Received: by 10.152.21.37 with SMTP id s5mr35227061lae.2.1435933764818; Fri, 03 Jul 2015 07:29:24 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id o2si7331880lah.162.2015.07.03.07.29.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Jul 2015 07:29:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by laar3 with SMTP id r3so87510080laa.0 for ; Fri, 03 Jul 2015 07:29:24 -0700 (PDT) X-Received: by 10.112.198.74 with SMTP id ja10mr36193755lbc.19.1435933764291; Fri, 03 Jul 2015 07:29: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 hn6csp68954lbb; Fri, 3 Jul 2015 07:29:23 -0700 (PDT) X-Received: by 10.140.19.48 with SMTP id 45mr50865109qgg.50.1435933762815; Fri, 03 Jul 2015 07:29:22 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id o1si10524052qgo.51.2015.07.03.07.29.21; Fri, 03 Jul 2015 07:29: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 67A4F62056; Fri, 3 Jul 2015 14:29:21 +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 8A05D62009; Fri, 3 Jul 2015 14:28:49 +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 23EB462050; Fri, 3 Jul 2015 14:28:43 +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 D81FA62050 for ; Fri, 3 Jul 2015 14:27:55 +0000 (UTC) Received: by lagc2 with SMTP id c2so87412430lag.3 for ; Fri, 03 Jul 2015 07:27:54 -0700 (PDT) X-Received: by 10.112.30.176 with SMTP id t16mr32218593lbh.30.1435933674815; Fri, 03 Jul 2015 07:27:54 -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 j2sm2371261lag.10.2015.07.03.07.27.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Jul 2015 07:27:51 -0700 (PDT) From: Christophe Milard To: anders.roxell@linaro.org, mike.holmes@linaro.org, stuart.haslam@linaro.org, maxim.uvarov@linaro.org Date: Fri, 3 Jul 2015 16:27:35 +0200 Message-Id: <1435933656-6848-4-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1435933656-6848-1-git-send-email-christophe.milard@linaro.org> References: <1435933656-6848-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Cc: lng-odp@lists.linaro.org Subject: [lng-odp] [PATCH 3/4] validation: creating own dir and lib for shmem 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.54 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 Signed-off-by: Christophe Milard --- configure.ac | 1 + test/validation/.gitignore | 1 - test/validation/Makefile.am | 11 ++++------- test/validation/shmem/.gitignore | 2 ++ test/validation/shmem/Makefile.am | 8 ++++++++ test/validation/{odp_shared_memory.c => shmem/shmem.c} | 9 ++------- test/validation/shmem/shmem.h | 7 +++++++ test/validation/shmem/shmem_main.c | 12 ++++++++++++ 8 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 test/validation/shmem/.gitignore create mode 100644 test/validation/shmem/Makefile.am rename test/validation/{odp_shared_memory.c => shmem/shmem.c} (94%) create mode 100644 test/validation/shmem/shmem.h create mode 100644 test/validation/shmem/shmem_main.c diff --git a/configure.ac b/configure.ac index f1de998..05719a2 100644 --- a/configure.ac +++ b/configure.ac @@ -319,6 +319,7 @@ AC_CONFIG_FILES([Makefile test/validation/synchronizers/Makefile test/validation/thread/Makefile test/validation/time/Makefile + test/validation/shmem/Makefile test/validation/system/Makefile test/miscellaneous/Makefile ]) diff --git a/test/validation/.gitignore b/test/validation/.gitignore index 50a459a..1a5eb04 100644 --- a/test/validation/.gitignore +++ b/test/validation/.gitignore @@ -1,4 +1,3 @@ *.log *.trs -odp_shared_memory odp_timer diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index 6a02f0a..010c6bf 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -4,11 +4,11 @@ include $(top_srcdir)/test/Makefile.inc AM_CFLAGS += -I$(srcdir)/common AM_LDFLAGS += -static -EXECUTABLES = odp_shared_memory$(EXEEXT) \ - odp_timer$(EXEEXT) +EXECUTABLES = odp_timer$(EXEEXT) if test_vald -TESTS = $(EXECUTABLES) +TESTS = $(EXECUTABLES) \ + shmem/shmem_main endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) @@ -16,10 +16,6 @@ bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) ODP_CU_COMMON=common/odp_cunit_common.c odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto -odp_shared_memory_LDADD = \ - $(top_builddir)/test/validation/common/libcunit_common.a \ - $(LIB)/libodp.la -dist_odp_shared_memory_SOURCES = odp_shared_memory.c dist_odp_timer_SOURCES = odp_timer.c ODP_MODULES = buffer \ @@ -37,6 +33,7 @@ ODP_MODULES = buffer \ synchronizers \ thread \ time \ + shmem \ system SUBDIRS = common $(ODP_MODULES) diff --git a/test/validation/shmem/.gitignore b/test/validation/shmem/.gitignore new file mode 100644 index 0000000..3cb00eb --- /dev/null +++ b/test/validation/shmem/.gitignore @@ -0,0 +1,2 @@ +shmem_main +libshmem.a diff --git a/test/validation/shmem/Makefile.am b/test/validation/shmem/Makefile.am new file mode 100644 index 0000000..eb808ad --- /dev/null +++ b/test/validation/shmem/Makefile.am @@ -0,0 +1,8 @@ +include ../Makefile.inc + +noinst_LIBRARIES = libshmem.a +libshmem_a_SOURCES = shmem.c + +bin_PROGRAMS = shmem_main$(EXEEXT) +dist_shmem_main_SOURCES = shmem_main.c +shmem_main_LDADD = libshmem.a $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/odp_shared_memory.c b/test/validation/shmem/shmem.c similarity index 94% rename from test/validation/odp_shared_memory.c rename to test/validation/shmem/shmem.c index 050e3e5..0c713c6 100644 --- a/test/validation/odp_shared_memory.c +++ b/test/validation/shmem/shmem.c @@ -6,6 +6,7 @@ #include #include +#include "shmem.h" #define ALIGE_SIZE (128) #define TESTNAME "cunit_test_shared_data" @@ -85,13 +86,7 @@ static CU_SuiteInfo shmem_suites[] = { CU_SUITE_INFO_NULL, }; -static int shmem_main(void) +int shmem_main(void) { return odp_cunit_run(shmem_suites); } - -/* the following main function will be separated when lib is created */ -int main(void) -{ - return shmem_main(); -} diff --git a/test/validation/shmem/shmem.h b/test/validation/shmem/shmem.h new file mode 100644 index 0000000..9b79027 --- /dev/null +++ b/test/validation/shmem/shmem.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2014, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +int shmem_main(void); diff --git a/test/validation/shmem/shmem_main.c b/test/validation/shmem/shmem_main.c new file mode 100644 index 0000000..445fbf1 --- /dev/null +++ b/test/validation/shmem/shmem_main.c @@ -0,0 +1,12 @@ +/* Copyright (c) 2014, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "shmem.h" + +int main(void) +{ + return shmem_main(); +}