From patchwork Wed Jun 17 21:51: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: 49995 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 E179C228FF for ; Wed, 17 Jun 2015 21:55:16 +0000 (UTC) Received: by wifx6 with SMTP id x6sf16687704wif.1 for ; Wed, 17 Jun 2015 14:55:16 -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=Wv7PVHOf8X4BnB6zfbHogphh76+j6egxmBa/K4UeIKo=; b=ZDDH6t8yXxCJT8vVOmvWtp9mNgIhrZBb3iSkjjW9j1sPQHMLw9HdxhVuXPsmud/wkJ URCl0hDhkWuBnmNE/Ogwx6MIwpWhs9yKH/dPPuzkPzmidLlvsla/A8dlrCHIdL00i4nX 2CeLLW9ynv8eqmdxLmp1qpPRm+569uDgGQ6mQCWud6OtIrktpVWW7XDQ7Lhw45waLyUw 1E5ws0B3DEMJUZsygcxuYezj5gyrIFYq8akNwj7UP7QuC62fHRl9dmcCdrL0jq5l64Xb 8drVP15RJE1vZ0oEgPEEKEw84eL4QH3ZWlEm8qXW5j0mg/sKYkr2KuJA47C9jmsUV56O MfZw== X-Gm-Message-State: ALoCoQmIQZMU0bAt/AWkdrp+SKeFEiItNoqGZ23tL5y6YmScSfom7tnZSEsMeSFy+EtGe4PhggT2 X-Received: by 10.152.37.101 with SMTP id x5mr7316867laj.5.1434578116188; Wed, 17 Jun 2015 14:55:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.207.2 with SMTP id ls2ls379018lac.51.gmail; Wed, 17 Jun 2015 14:55:16 -0700 (PDT) X-Received: by 10.112.186.35 with SMTP id fh3mr10034171lbc.82.1434578116035; Wed, 17 Jun 2015 14:55:16 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id x10si4729673lbo.118.2015.06.17.14.55.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jun 2015 14:55:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by labko7 with SMTP id ko7so42623320lab.2 for ; Wed, 17 Jun 2015 14:55:16 -0700 (PDT) X-Received: by 10.112.140.231 with SMTP id rj7mr9924852lbb.76.1434578115931; Wed, 17 Jun 2015 14:55:15 -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 hn6csp752502lbb; Wed, 17 Jun 2015 14:55:14 -0700 (PDT) X-Received: by 10.140.30.166 with SMTP id d35mr10522563qgd.85.1434578114421; Wed, 17 Jun 2015 14:55:14 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id q22si5807108qkh.117.2015.06.17.14.55.13; Wed, 17 Jun 2015 14:55:14 -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 9BC7B61FA5; Wed, 17 Jun 2015 21:55:13 +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 08FCC61FB2; Wed, 17 Jun 2015 21:52:42 +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 09C6C61FA2; Wed, 17 Jun 2015 21:52:27 +0000 (UTC) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com [209.85.215.54]) by lists.linaro.org (Postfix) with ESMTPS id C94C961DC8 for ; Wed, 17 Jun 2015 21:52:16 +0000 (UTC) Received: by laka10 with SMTP id a10so42528125lak.0 for ; Wed, 17 Jun 2015 14:52:15 -0700 (PDT) X-Received: by 10.112.105.104 with SMTP id gl8mr10038895lbb.81.1434577935748; Wed, 17 Jun 2015 14:52:15 -0700 (PDT) Received: from mobile-VirtualBox.caveonetworks.com (c-83-233-90-46.cust.bredband2.com. [83.233.90.46]) by mx.google.com with ESMTPSA id k10sm1273417lbq.9.2015.06.17.14.52.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Jun 2015 14:52:14 -0700 (PDT) From: Christophe Milard To: anders.roxell@linaro.org, mike.holmes@linaro.org, stuart.haslam@linaro.org, maxim.uvarov@linaro.org Date: Wed, 17 Jun 2015 23:51:44 +0200 Message-Id: <1434577905-11797-5-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434577905-11797-1-git-send-email-christophe.milard@linaro.org> References: <1434577905-11797-1-git-send-email-christophe.milard@linaro.org> X-Topics: crypto patch Cc: lng-odp@lists.linaro.org Subject: [lng-odp] [PATCH 4/5] validation: creating own dir and lib for crypto 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.44 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 crypto 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 | 12 +++++------- test/validation/crypto/.gitignore | 2 ++ test/validation/crypto/Makefile.am | 9 +++++++++ test/validation/{odp_crypto.c => crypto/crypto.c} | 9 ++------- test/validation/crypto/crypto.h | 7 +++++++ test/validation/crypto/crypto_main.c | 12 ++++++++++++ 8 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 test/validation/crypto/.gitignore create mode 100644 test/validation/crypto/Makefile.am rename test/validation/{odp_crypto.c => crypto/crypto.c} (94%) create mode 100644 test/validation/crypto/crypto.h create mode 100644 test/validation/crypto/crypto_main.c diff --git a/configure.ac b/configure.ac index de7de50..3010789 100644 --- a/configure.ac +++ b/configure.ac @@ -304,6 +304,7 @@ AC_CONFIG_FILES([Makefile test/performance/Makefile test/validation/Makefile test/validation/common/Makefile + test/validation/crypto/Makefile test/validation/pktio/Makefile test/miscellaneous/Makefile ]) diff --git a/test/validation/.gitignore b/test/validation/.gitignore index 7d3a0fc..765c8b0 100644 --- a/test/validation/.gitignore +++ b/test/validation/.gitignore @@ -4,7 +4,6 @@ odp_ver_abt_log_dbg odp_buffer odp_classification odp_cpumask -odp_crypto odp_init odp_init_abort odp_init_log diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index e40bc7d..3992e8f 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -7,7 +7,6 @@ AM_LDFLAGS += -static EXECUTABLES = odp_buffer \ odp_classification \ odp_cpumask \ - odp_crypto \ odp_init \ odp_init_abort \ odp_init_log \ @@ -24,7 +23,8 @@ EXECUTABLES = odp_buffer \ odp_ver_abt_log_dbg if test_vald -TESTS = $(EXECUTABLES) +TESTS = $(EXECUTABLES) \ + crypto/crypto_main endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) @@ -38,10 +38,6 @@ 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 -odp_crypto_LDADD = $(top_builddir)/test/validation/common/libcunit_common.a \ - $(LIB)/libodp.la -dist_odp_crypto_SOURCES = crypto/odp_crypto_test_inp.c \ - odp_crypto.c dist_odp_init_SOURCES = init/odp_init.c dist_odp_init_abort_SOURCES = init/odp_init_abort.c dist_odp_init_log_SOURCES = init/odp_init_log.c @@ -61,5 +57,7 @@ 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 = crypto \ + pktio + SUBDIRS = common $(ODP_MODULES) diff --git a/test/validation/crypto/.gitignore b/test/validation/crypto/.gitignore new file mode 100644 index 0000000..998752b --- /dev/null +++ b/test/validation/crypto/.gitignore @@ -0,0 +1,2 @@ +crypto_main +libcrypto.a diff --git a/test/validation/crypto/Makefile.am b/test/validation/crypto/Makefile.am new file mode 100644 index 0000000..0ce3aa5 --- /dev/null +++ b/test/validation/crypto/Makefile.am @@ -0,0 +1,9 @@ +include ../Makefile.inc + +noinst_LIBRARIES = libcrypto.a +libcrypto_a_SOURCES = crypto.c \ + odp_crypto_test_inp.c + +bin_PROGRAMS = crypto_main +dist_crypto_main_SOURCES = crypto_main.c +crypto_main_LDADD = libcrypto.a $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/odp_crypto.c b/test/validation/crypto/crypto.c similarity index 94% rename from test/validation/odp_crypto.c rename to test/validation/crypto/crypto.c index 56f9938..899fb51 100644 --- a/test/validation/odp_crypto.c +++ b/test/validation/crypto/crypto.c @@ -7,6 +7,7 @@ #include #include "odp_cunit_common.h" #include "odp_crypto_test_inp.h" +#include "crypto.h" #define SHM_PKT_POOL_SIZE (512 * 2048 * 2) #define SHM_PKT_POOL_BUF_SIZE (1024 * 32) @@ -93,13 +94,7 @@ int tests_global_term(void) return 0; } -static int crypto_main(void) +int crypto_main(void) { return odp_cunit_run(crypto_suites); } - -/* the following main function will be separated when lib is created */ -int main(void) -{ - return crypto_main(); -} diff --git a/test/validation/crypto/crypto.h b/test/validation/crypto/crypto.h new file mode 100644 index 0000000..aacb511 --- /dev/null +++ b/test/validation/crypto/crypto.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +int crypto_main(void); diff --git a/test/validation/crypto/crypto_main.c b/test/validation/crypto/crypto_main.c new file mode 100644 index 0000000..644e666 --- /dev/null +++ b/test/validation/crypto/crypto_main.c @@ -0,0 +1,12 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "crypto.h" + +int main(void) +{ + return crypto_main(); +}