From patchwork Tue Jun 30 16:14:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 50488 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 94B64229DF for ; Tue, 30 Jun 2015 16:18:39 +0000 (UTC) Received: by wiwz6 with SMTP id z6sf8592754wiw.0 for ; Tue, 30 Jun 2015 09:18:38 -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=m74U2LiIKDcx5xnf0ATrYzMgpz3yNfTz9zzNK78HAAY=; b=DOOssSETEcrd4oC5TltaJ1p1ouLyzX+D1UsJ+jMi01OFGEaYxY7NdtIdVImQSE8sAF uLcm64PsFTGyBFn4fpGWuAEobqEedO5T+uw7cbFHZMRzcrtlHY71DgPoANLtbBhR7+OQ tJdbFQL626mTxlyf7JxCjAM3UzifL1TR43vl+QRYUv2U6M0N5APUWg9vpK8x51Z10mwS rT60XQTvCSa/S2q6FBIf3KuHJ4uF6CkoupArNH6fzLWGkUulvDnzyUOL6M/39TQQLkFh +xyNodaOnNv11/NiNugTondJVBCyr291tOzScTQcyfqKixsmw8dn+hOxE6WmtO3xAOZO 1j5w== X-Gm-Message-State: ALoCoQn39ctOJyZH5elkg8p0ibyyaAIWo5VbY9WcEJ2yH32K7mDnxe9honHndmfH+7YbV+2uHRlq X-Received: by 10.152.120.69 with SMTP id la5mr13833539lab.7.1435681118767; Tue, 30 Jun 2015 09:18:38 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.102 with SMTP id s6ls65084lag.102.gmail; Tue, 30 Jun 2015 09:18:38 -0700 (PDT) X-Received: by 10.112.170.167 with SMTP id an7mr20575815lbc.103.1435681118614; Tue, 30 Jun 2015 09:18:38 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id bb9si21389359lab.89.2015.06.30.09.18.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jun 2015 09:18:38 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by lagh6 with SMTP id h6so20187695lag.2 for ; Tue, 30 Jun 2015 09:18:38 -0700 (PDT) X-Received: by 10.152.7.7 with SMTP id f7mr20670555laa.106.1435681118407; Tue, 30 Jun 2015 09:18:38 -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 hn6csp2574743lbb; Tue, 30 Jun 2015 09:18:37 -0700 (PDT) X-Received: by 10.140.98.238 with SMTP id o101mr16191796qge.12.1435681117011; Tue, 30 Jun 2015 09:18:37 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id j3si5641381qga.33.2015.06.30.09.18.36; Tue, 30 Jun 2015 09:18:36 -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 5B53561F12; Tue, 30 Jun 2015 16:18:36 +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 431A461F11; Tue, 30 Jun 2015 16:15: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 7DB4C6107B; Tue, 30 Jun 2015 16:15:43 +0000 (UTC) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com [209.85.215.43]) by lists.linaro.org (Postfix) with ESMTPS id 4A24A61F07 for ; Tue, 30 Jun 2015 16:15:12 +0000 (UTC) Received: by lagc2 with SMTP id c2so20069151lag.3 for ; Tue, 30 Jun 2015 09:15:11 -0700 (PDT) X-Received: by 10.152.22.129 with SMTP id d1mr20608994laf.13.1435680911156; Tue, 30 Jun 2015 09:15:11 -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 x4sm9024476lag.40.2015.06.30.09.15.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 Jun 2015 09:15:10 -0700 (PDT) From: Christophe Milard To: anders.roxell@linaro.org, mike.holmes@linaro.org, stuart.haslam@linaro.org, maxim.uvarov@linaro.org Date: Tue, 30 Jun 2015 18:14:55 +0200 Message-Id: <1435680896-11924-5-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1435680896-11924-1-git-send-email-christophe.milard@linaro.org> References: <1435680896-11924-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Cc: lng-odp@lists.linaro.org Subject: [lng-odp] [PATCH 4/5] validation: creating own dir and lib for scheduler 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.51 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 scheduler 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 | 9 +++------ test/validation/scheduler/.gitignore | 2 ++ test/validation/scheduler/Makefile.am | 8 ++++++++ test/validation/{odp_scheduler.c => scheduler/scheduler.c} | 9 ++------- test/validation/scheduler/scheduler.h | 7 +++++++ test/validation/scheduler/scheduler_main.c | 12 ++++++++++++ 8 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 test/validation/scheduler/.gitignore create mode 100644 test/validation/scheduler/Makefile.am rename test/validation/{odp_scheduler.c => scheduler/scheduler.c} (99%) create mode 100644 test/validation/scheduler/scheduler.h create mode 100644 test/validation/scheduler/scheduler_main.c diff --git a/configure.ac b/configure.ac index 6c29c0e..bfe5964 100644 --- a/configure.ac +++ b/configure.ac @@ -313,6 +313,7 @@ AC_CONFIG_FILES([Makefile test/validation/pool/Makefile test/validation/queue/Makefile test/validation/random/Makefile + test/validation/scheduler/Makefile test/validation/system/Makefile test/miscellaneous/Makefile ]) diff --git a/test/validation/.gitignore b/test/validation/.gitignore index e1fb4f1..cf48485 100644 --- a/test/validation/.gitignore +++ b/test/validation/.gitignore @@ -2,7 +2,6 @@ *.trs odp_ver_abt_log_dbg odp_cpumask -odp_scheduler odp_shared_memory odp_synchronizers odp_timer diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index 872064a..53a31e4 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -5,7 +5,6 @@ AM_CFLAGS += -I$(srcdir)/common AM_LDFLAGS += -static EXECUTABLES = odp_cpumask$(EXEEXT) \ - odp_scheduler$(EXEEXT) \ odp_shared_memory$(EXEEXT) \ odp_synchronizers$(EXEEXT) \ odp_timer$(EXEEXT) \ @@ -13,7 +12,8 @@ EXECUTABLES = odp_cpumask$(EXEEXT) \ odp_ver_abt_log_dbg$(EXEEXT) if test_vald -TESTS = $(EXECUTABLES) +TESTS = $(EXECUTABLES) \ + scheduler/scheduler_main endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) @@ -21,10 +21,6 @@ bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) ODP_CU_COMMON=common/odp_cunit_common.c odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto -odp_scheduler_LDADD = \ - $(top_builddir)/test/validation/common/libcunit_common.a \ - $(LIB)/libodp.la -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 @@ -44,6 +40,7 @@ ODP_MODULES = buffer \ pktio \ pool \ random \ + scheduler \ system SUBDIRS = common $(ODP_MODULES) diff --git a/test/validation/scheduler/.gitignore b/test/validation/scheduler/.gitignore new file mode 100644 index 0000000..03a6f39 --- /dev/null +++ b/test/validation/scheduler/.gitignore @@ -0,0 +1,2 @@ +libscheduler.a +scheduler_main diff --git a/test/validation/scheduler/Makefile.am b/test/validation/scheduler/Makefile.am new file mode 100644 index 0000000..8224a66 --- /dev/null +++ b/test/validation/scheduler/Makefile.am @@ -0,0 +1,8 @@ +include ../Makefile.inc + +noinst_LIBRARIES = libscheduler.a +libscheduler_a_SOURCES = scheduler.c + +bin_PROGRAMS = scheduler_main$(EXEEXT) +dist_scheduler_main_SOURCES = scheduler_main.c +scheduler_main_LDADD = libscheduler.a $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/odp_scheduler.c b/test/validation/scheduler/scheduler.c similarity index 99% rename from test/validation/odp_scheduler.c rename to test/validation/scheduler/scheduler.c index 2f2e627..e03af13 100644 --- a/test/validation/odp_scheduler.c +++ b/test/validation/scheduler/scheduler.c @@ -6,6 +6,7 @@ #include #include "odp_cunit_common.h" +#include "scheduler.h" #define MAX_WORKERS_THREADS 32 #define MSG_POOL_SIZE (4 * 1024 * 1024) @@ -816,13 +817,7 @@ static CU_SuiteInfo scheduler_suites[] = { CU_SUITE_INFO_NULL, }; -static int scheduler_main(void) +int scheduler_main(void) { return odp_cunit_run(scheduler_suites); } - -/* the following main function will be separated when lib is created */ -int main(void) -{ - return scheduler_main(); -} diff --git a/test/validation/scheduler/scheduler.h b/test/validation/scheduler/scheduler.h new file mode 100644 index 0000000..f2d5795 --- /dev/null +++ b/test/validation/scheduler/scheduler.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +int scheduler_main(void); diff --git a/test/validation/scheduler/scheduler_main.c b/test/validation/scheduler/scheduler_main.c new file mode 100644 index 0000000..1f6f32f --- /dev/null +++ b/test/validation/scheduler/scheduler_main.c @@ -0,0 +1,12 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "scheduler.h" + +int main(void) +{ + return scheduler_main(); +}