From patchwork Tue Jun 9 11:44:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 49648 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 955AB21419 for ; Tue, 9 Jun 2015 11:47:13 +0000 (UTC) Received: by labc7 with SMTP id c7sf4065805lab.1 for ; Tue, 09 Jun 2015 04:47:12 -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=wMM70rLHLfQWXmjfKK3MPLHH2/OWBRhWZOYlresU8OE=; b=CIwKmEtvQvksncZjDXxliOWCJBTYKPXWWSdptFnOeo2xo/7R2Y32aW5VxLVyujuSfH D3je6WaoC1RrWIfmQVHJgDkqm6JxlFYt1Y2jDpBSgi9SDfAQO0MY/1B8vstybcpbYzSq aaSpei29Evwga4JFHwCuL/1TOimMGy9BIqrfOCSEg4zJRmhRR01lV9dlExOzTa9HULcI rfzNEV/ACOUEIQp0xJ3FGp6Xm5GbERDoURfkYbVJc1Uzb8xOzQtl/mLLeEqNEe9Yzkff hRdteMt62oDlhaWDwWxa+noXxxOu5IlsAsL7EG1kVRg5SYiwKIPf0fiTSEUNlVejo5IX buDw== X-Gm-Message-State: ALoCoQn6ejEO0+AZ3dE3diti6iy90IRdQTiumEmcvpNkFndLJOQ4S1FSCZY4jWF/HpkFwL5BotjC X-Received: by 10.152.203.233 with SMTP id kt9mr21482437lac.7.1433850432620; Tue, 09 Jun 2015 04:47:12 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.168 with SMTP id w8ls60120lae.41.gmail; Tue, 09 Jun 2015 04:47:12 -0700 (PDT) X-Received: by 10.112.140.137 with SMTP id rg9mr22114812lbb.101.1433850432470; Tue, 09 Jun 2015 04:47:12 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id t14si5548063laz.32.2015.06.09.04.47.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2015 04:47:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by laew7 with SMTP id w7so10173327lae.1 for ; Tue, 09 Jun 2015 04:47:12 -0700 (PDT) X-Received: by 10.152.225.166 with SMTP id rl6mr22070153lac.36.1433850432348; Tue, 09 Jun 2015 04:47:12 -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 hn6csp2547007lbb; Tue, 9 Jun 2015 04:47:11 -0700 (PDT) X-Received: by 10.140.130.88 with SMTP id 85mr26635347qhc.12.1433850430403; Tue, 09 Jun 2015 04:47:10 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id g13si5104385qhc.50.2015.06.09.04.47.09; Tue, 09 Jun 2015 04:47:10 -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 6590B61E47; Tue, 9 Jun 2015 11:47:09 +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 E93B061ED8; Tue, 9 Jun 2015 11:45:34 +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 6A5E76183F; Tue, 9 Jun 2015 11:45:22 +0000 (UTC) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com [209.85.215.46]) by lists.linaro.org (Postfix) with ESMTPS id 7FD7F61E8D for ; Tue, 9 Jun 2015 11:44:46 +0000 (UTC) Received: by laar3 with SMTP id r3so10072106laa.3 for ; Tue, 09 Jun 2015 04:44:45 -0700 (PDT) X-Received: by 10.152.44.166 with SMTP id f6mr22157643lam.86.1433850285453; Tue, 09 Jun 2015 04:44:45 -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 bm5sm44272lbc.45.2015.06.09.04.44.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Jun 2015 04:44:44 -0700 (PDT) From: Christophe Milard To: anders.roxell@linaro.org, mike.holmes@linaro.org, stuart.haslam@linaro.org, maxim.uvarov@linaro.org Date: Tue, 9 Jun 2015 13:44:14 +0200 Message-Id: <1433850261-1302-2-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433850261-1302-1-git-send-email-christophe.milard@linaro.org> References: <1433850261-1302-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Cc: lng-odp@lists.linaro.org Subject: [lng-odp] [PATCHv4 1/8] validation: preparing for main in tests 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.49 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 In odp_cunit_common.c, a macro, called MODULE_HAS_OWN_MAIN is used to tell whether to define a main or not. If MODULE_HAS_OWN_MAIN is defined, odp_cunit_common.c does not define any main, but offers odp_cunit_run(CU_SuiteInfo testsuites[]) to run the tests. Two libs are then built, one with MODULE_HAS_OWN_MAIN defined (to be used in the future, by tests which define their own main) and one with MODULE_HAS_OWN_MAIN undefined, used by all tests at this stage. Signed-off-by: Christophe Milard --- configure.ac | 1 + test/Makefile.inc | 7 +++++- test/validation/Makefile.am | 40 ++++++++++++++++--------------- test/validation/common/.gitignore | 2 ++ test/validation/common/Makefile.am | 10 ++++++++ test/validation/common/odp_cunit_common.c | 18 +++++++------- test/validation/common/odp_cunit_common.h | 3 +++ 7 files changed, 53 insertions(+), 28 deletions(-) create mode 100644 test/validation/common/.gitignore create mode 100644 test/validation/common/Makefile.am diff --git a/configure.ac b/configure.ac index 89b0846..b604fd6 100644 --- a/configure.ac +++ b/configure.ac @@ -301,6 +301,7 @@ AC_CONFIG_FILES([Makefile test/api_test/Makefile test/performance/Makefile test/validation/Makefile + test/validation/common/Makefile test/miscellaneous/Makefile ]) diff --git a/test/Makefile.inc b/test/Makefile.inc index e20a848..1eb6ed5 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -1,7 +1,12 @@ include $(top_srcdir)/Makefile.inc include $(top_srcdir)/platform/@with_platform@/Makefile.inc LIB = $(top_builddir)/lib -LDADD = $(LIB)/libodp.la + +#in the following line, the libs using the symbols should come before +#the libs containing them! The includer is given a chance to add things +#before libodp by setting PRE_LDADD before the inclusion. +LDADD = $(PRE_LDADD) $(LIB)/libodp.la + INCFLAGS = -I$(srcdir) \ -I$(top_srcdir)/test \ -I$(top_srcdir)/platform/@with_platform@/include \ diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index 577063b..e1474aa 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -1,3 +1,4 @@ +PRE_LDADD = $(top_builddir)/test/validation/common/libcunit_common_as_main.a include $(top_srcdir)/test/Makefile.inc AM_CFLAGS += -I$(srcdir)/common @@ -39,30 +40,31 @@ bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) ODP_CU_COMMON=common/odp_cunit_common.c odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer -dist_odp_buffer_SOURCES = odp_buffer.c $(ODP_CU_COMMON) +dist_odp_buffer_SOURCES = odp_buffer.c odp_classification_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/classification dist_odp_classification_SOURCES = classification/odp_classification_tests.c \ classification/odp_classification_basic.c \ - odp_classification.c $(ODP_CU_COMMON) + odp_classification.c odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto dist_odp_crypto_SOURCES = crypto/odp_crypto_test_inp.c \ - odp_crypto.c $(ODP_CU_COMMON) -dist_odp_init_SOURCES = init/odp_init.c $(ODP_CU_COMMON) -dist_odp_init_abort_SOURCES = init/odp_init_abort.c $(ODP_CU_COMMON) -dist_odp_init_log_SOURCES = init/odp_init_log.c $(ODP_CU_COMMON) -dist_odp_queue_SOURCES = odp_queue.c $(ODP_CU_COMMON) -dist_odp_random_SOURCES = odp_random.c $(ODP_CU_COMMON) -dist_odp_scheduler_SOURCES = odp_scheduler.c $(ODP_CU_COMMON) -dist_odp_shared_memory_SOURCES = odp_shared_memory.c $(ODP_CU_COMMON) -dist_odp_synchronizers_SOURCES = odp_synchronizers.c $(ODP_CU_COMMON) -dist_odp_time_SOURCES = odp_time.c $(ODP_CU_COMMON) -dist_odp_timer_SOURCES = odp_timer.c $(ODP_CU_COMMON) -dist_odp_pktio_SOURCES = odp_pktio.c $(ODP_CU_COMMON) -dist_odp_packet_SOURCES = odp_packet.c $(ODP_CU_COMMON) -dist_odp_pool_SOURCES = odp_pool.c $(ODP_CU_COMMON) -dist_odp_cpumask_SOURCES = odp_cpumask.c $(ODP_CU_COMMON) -dist_odp_thread_SOURCES = odp_thread.c $(ODP_CU_COMMON) + 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 +dist_odp_queue_SOURCES = odp_queue.c +dist_odp_random_SOURCES = odp_random.c +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_time_SOURCES = odp_time.c +dist_odp_timer_SOURCES = odp_timer.c +dist_odp_pktio_SOURCES = odp_pktio.c +dist_odp_packet_SOURCES = odp_packet.c +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 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_CU_COMMON) + ver_abt_log_dbg/odp_ver_abt_log_dbg.c +SUBDIRS = common diff --git a/test/validation/common/.gitignore b/test/validation/common/.gitignore new file mode 100644 index 0000000..e8aa876 --- /dev/null +++ b/test/validation/common/.gitignore @@ -0,0 +1,2 @@ +libcunit_common.a +libcunit_common_as_main.a diff --git a/test/validation/common/Makefile.am b/test/validation/common/Makefile.am new file mode 100644 index 0000000..bd2f214 --- /dev/null +++ b/test/validation/common/Makefile.am @@ -0,0 +1,10 @@ +AUTOMAKE_OPTIONS = foreign +include $(top_srcdir)/test/Makefile.inc + +#libcunit_common_as_main.a is meant to be removed when all tests define +#their own main +noinst_LIBRARIES = libcunit_common.a libcunit_common_as_main.a +libcunit_common_a_CFLAGS = $(AM_CFLAGS) -DMODULE_HAS_OWN_MAIN +libcunit_common_a_SOURCES = odp_cunit_common.c +libcunit_common_as_main_a_CFLAGS = $(AM_CFLAGS) +libcunit_common_as_main_a_SOURCES = odp_cunit_common.c diff --git a/test/validation/common/odp_cunit_common.c b/test/validation/common/odp_cunit_common.c index eac2d81..2b83ae6 100644 --- a/test/validation/common/odp_cunit_common.c +++ b/test/validation/common/odp_cunit_common.c @@ -4,12 +4,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ -/** - * @file - * - * ODP test application common - */ - #include #include #include @@ -68,7 +62,7 @@ ODP_WEAK_SYMBOL int tests_global_term(void) return 0; } -int main(void) +int odp_cunit_run(CU_SuiteInfo testsuites[]) { int ret; @@ -81,7 +75,7 @@ int main(void) CU_set_error_action(CUEA_ABORT); CU_initialize_registry(); - CU_register_suites(odp_testsuites); + CU_register_suites(testsuites); CU_basic_set_mode(CU_BRM_VERBOSE); CU_basic_run_tests(); @@ -94,3 +88,11 @@ int main(void) return (ret) ? -1 : 0; } + +/* this is left for old style main declartion. will be removed soon */ +#ifndef MODULE_HAS_OWN_MAIN +int main(void) +{ + return odp_cunit_run(odp_testsuites); +} +#endif diff --git a/test/validation/common/odp_cunit_common.h b/test/validation/common/odp_cunit_common.h index 127020d..3b4d9fb 100644 --- a/test/validation/common/odp_cunit_common.h +++ b/test/validation/common/odp_cunit_common.h @@ -24,6 +24,9 @@ */ extern CU_SuiteInfo odp_testsuites[]; +/* the function, called by module main(), to run the testsuites: */ +int odp_cunit_run(CU_SuiteInfo testsuites[]); + typedef struct { uint32_t foo; uint32_t bar;