From patchwork Mon Jun 22 11:41:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 50162 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8FC9121594 for ; Mon, 22 Jun 2015 11:45:00 +0000 (UTC) Received: by wicnd19 with SMTP id nd19sf20979961wic.0 for ; Mon, 22 Jun 2015 04:44:59 -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=psiEMMniJAIVLjtKTkx5Nii2qUz1migaLdrEoTZQ6kE=; b=nJW03trc/NiUGdk6OgGXdmN2qzsD9Y2aZWJiFknag0in3zWrifiQGEWdBlNYgzCyaJ tw4vpY9dbLMDnvCHP++hcOzTQJMSDuWMeqJCCzkA2789Q/2+/vLY8IRqdrEfLdf4seB1 ot62rrCCGbm+2GdJA3DbH4E5DAD0UCoqmiUe/VPDK0Wg1aad4pEujx+T18tLRqF1B5iq 3suPD1IVX4x24YdPSO/AZ3EqRDFKHcwFpV7seaMVHNpWdyJsN28Dw2tFFghprCyHDMX3 gzMUxn5byEqcpmXjTGZCcbS5KuHrNCsvtZ8uXW3fkOR2GF6qImgpZLcQGP7oAp1ycJCy UQew== X-Gm-Message-State: ALoCoQnPTXXbXFCLcUaugh3ytEn2LEiEbUO3XxdmkxgWf5h+vnhUuTPryGoCdx/sNmhOSQap42X6 X-Received: by 10.113.11.3 with SMTP id ee3mr27749219lbd.9.1434973499801; Mon, 22 Jun 2015 04:44:59 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.202 with SMTP id d10ls925581laa.69.gmail; Mon, 22 Jun 2015 04:44:59 -0700 (PDT) X-Received: by 10.152.37.67 with SMTP id w3mr29723011laj.123.1434973499642; Mon, 22 Jun 2015 04:44:59 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id th3si16327787lbb.146.2015.06.22.04.44.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2015 04:44:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbbpo10 with SMTP id po10so7276031lbb.3 for ; Mon, 22 Jun 2015 04:44:59 -0700 (PDT) X-Received: by 10.112.199.133 with SMTP id jk5mr30469022lbc.32.1434973499304; Mon, 22 Jun 2015 04:44:59 -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 hn6csp2320018lbb; Mon, 22 Jun 2015 04:44:56 -0700 (PDT) X-Received: by 10.140.36.137 with SMTP id p9mr36483980qgp.16.1434973495968; Mon, 22 Jun 2015 04:44:55 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 107si18755648qge.122.2015.06.22.04.44.55; Mon, 22 Jun 2015 04:44:55 -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 3438461D79; Mon, 22 Jun 2015 11:44:55 +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_H2, 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 157F561D86; Mon, 22 Jun 2015 11:42:58 +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 C4EC861D86; Mon, 22 Jun 2015 11:42:53 +0000 (UTC) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com [209.85.217.176]) by lists.linaro.org (Postfix) with ESMTPS id 882C261D8A for ; Mon, 22 Jun 2015 11:42:07 +0000 (UTC) Received: by lbbpo10 with SMTP id po10so7234398lbb.3 for ; Mon, 22 Jun 2015 04:42:06 -0700 (PDT) X-Received: by 10.152.88.99 with SMTP id bf3mr29063290lab.97.1434973326455; Mon, 22 Jun 2015 04:42:06 -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 la10sm4595952lab.15.2015.06.22.04.42.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Jun 2015 04:42:05 -0700 (PDT) From: Christophe Milard To: anders.roxell@linaro.org, mike.holmes@linaro.org, stuart.haslam@linaro.org, maxim.uvarov@linaro.org Date: Mon, 22 Jun 2015 13:41:44 +0200 Message-Id: <1434973305-9684-5-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434973305-9684-1-git-send-email-christophe.milard@linaro.org> References: <1434973305-9684-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 pktio 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.181 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 classification 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 | 13 +++---------- test/validation/classification/.gitignore | 2 ++ test/validation/classification/Makefile.am | 10 ++++++++++ .../classification.c} | 9 ++------- test/validation/classification/classification.h | 7 +++++++ test/validation/classification/classification_main.c | 12 ++++++++++++ 8 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 test/validation/classification/.gitignore create mode 100644 test/validation/classification/Makefile.am rename test/validation/{odp_classification.c => classification/classification.c} (78%) create mode 100644 test/validation/classification/classification.h create mode 100644 test/validation/classification/classification_main.c diff --git a/configure.ac b/configure.ac index de7de50..26c3cb8 100644 --- a/configure.ac +++ b/configure.ac @@ -303,6 +303,7 @@ AC_CONFIG_FILES([Makefile test/api_test/Makefile test/performance/Makefile test/validation/Makefile + test/validation/classification/Makefile test/validation/common/Makefile test/validation/pktio/Makefile test/miscellaneous/Makefile diff --git a/test/validation/.gitignore b/test/validation/.gitignore index 7d3a0fc..5142fa5 100644 --- a/test/validation/.gitignore +++ b/test/validation/.gitignore @@ -2,7 +2,6 @@ *.trs odp_ver_abt_log_dbg odp_buffer -odp_classification odp_cpumask odp_crypto odp_init diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index 04f7dfe..1e3be59 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_buffer \ - odp_classification \ odp_cpumask \ odp_crypto \ odp_init \ @@ -24,7 +23,8 @@ EXECUTABLES = odp_buffer \ odp_ver_abt_log_dbg if test_vald -TESTS = $(EXECUTABLES) +TESTS = $(EXECUTABLES) \ + classification/classification_main endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) @@ -33,13 +33,6 @@ ODP_CU_COMMON=common/odp_cunit_common.c odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer dist_odp_buffer_SOURCES = odp_buffer.c -odp_classification_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/classification -odp_classification_LDADD = \ - $(top_builddir)/test/validation/common/libcunit_common.a \ - $(LIB)/libodp.la -dist_odp_classification_SOURCES = classification/odp_classification_tests.c \ - classification/odp_classification_basic.c \ - odp_classification.c odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto dist_odp_crypto_SOURCES = crypto/odp_crypto_test_inp.c \ odp_crypto.c @@ -62,5 +55,5 @@ dist_odp_ver_abt_log_dbg_SOURCES = ver_abt_log_dbg/odp_system.c \ ver_abt_log_dbg/odp_errno.c \ ver_abt_log_dbg/odp_ver_abt_log_dbg.c -ODP_MODULES = pktio +ODP_MODULES = pktio classification SUBDIRS = common $(ODP_MODULES) diff --git a/test/validation/classification/.gitignore b/test/validation/classification/.gitignore new file mode 100644 index 0000000..3887aec --- /dev/null +++ b/test/validation/classification/.gitignore @@ -0,0 +1,2 @@ +classification_main +libclassification.a diff --git a/test/validation/classification/Makefile.am b/test/validation/classification/Makefile.am new file mode 100644 index 0000000..1413c20 --- /dev/null +++ b/test/validation/classification/Makefile.am @@ -0,0 +1,10 @@ +include ../Makefile.inc + +noinst_LIBRARIES = libclassification.a +libclassification_a_SOURCES = odp_classification_basic.c \ + odp_classification_tests.c \ + classification.c + +bin_PROGRAMS = classification_main +dist_classification_main_SOURCES = classification_main.c +classification_main_LDADD = libclassification.a $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/odp_classification.c b/test/validation/classification/classification.c similarity index 78% rename from test/validation/odp_classification.c rename to test/validation/classification/classification.c index 69cdd4b..2582aaa 100644 --- a/test/validation/odp_classification.c +++ b/test/validation/classification/classification.c @@ -7,6 +7,7 @@ #include #include #include "odp_classification_testsuites.h" +#include "classification.h" static CU_SuiteInfo classification_suites[] = { { .pName = "classification basic", @@ -20,13 +21,7 @@ static CU_SuiteInfo classification_suites[] = { CU_SUITE_INFO_NULL, }; -static int classification_main(void) +int classification_main(void) { return odp_cunit_run(classification_suites); } - -/* the following main function will be separated when lib is created */ -int main(void) -{ - return classification_main(); -} diff --git a/test/validation/classification/classification.h b/test/validation/classification/classification.h new file mode 100644 index 0000000..e677343 --- /dev/null +++ b/test/validation/classification/classification.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +int classification_main(void); diff --git a/test/validation/classification/classification_main.c b/test/validation/classification/classification_main.c new file mode 100644 index 0000000..712fada --- /dev/null +++ b/test/validation/classification/classification_main.c @@ -0,0 +1,12 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "classification.h" + +int main(void) +{ + return classification_main(); +}