From patchwork Thu Jul 9 09:25:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 50927 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 A6292228E5 for ; Thu, 9 Jul 2015 09:26:57 +0000 (UTC) Received: by lagc2 with SMTP id c2sf28699663lag.0 for ; Thu, 09 Jul 2015 02:26:56 -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=O6v/KLd+P/g6qqzSrueZHpt0Ih+7nlgMh5S2M0iNFJM=; b=MFIm63MUeCbOC3oWZZqd3YKm0B/RTR02hlRu4yI1Q3vAptg492bSE+QfpAyRC0DocK ideY0kSLvN/ku5enYsKiS37OriTmS3HPUsVMIibeJ8s4zjzqUQUUCQI6iG2FG9GIFIa3 yKoy792nXvqcgLHafFcg8xexEYV9Ndr8fVcMukwD//Sz4vbrXQ/c1tWEoQDLI5+MZvA5 UiOocevMGV8BIhl7swaBR80592mjs6aePkosJJSOJCIi06v/5wgTO7J68HlZ074I9XWf PDS4vT4B9D3pzyctI07DFVQf7e1Hy2n2C7TMu/AFFKmm/yat0nKiVqDHuGzOfYIMxVlx p67Q== X-Gm-Message-State: ALoCoQky7tg1Rmd+Npyc9ZznKWGAoxKoRcueCxKFXDkkuAWfbWa7VQpaMq6/nvXIodHCxPy9N/W9 X-Received: by 10.180.83.33 with SMTP id n1mr18432743wiy.4.1436434016643; Thu, 09 Jul 2015 02:26:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.36 with SMTP id g4ls1098728lah.33.gmail; Thu, 09 Jul 2015 02:26:56 -0700 (PDT) X-Received: by 10.112.146.36 with SMTP id sz4mr13993739lbb.54.1436434016503; Thu, 09 Jul 2015 02:26:56 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id re5si4285838lbb.150.2015.07.09.02.26.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Jul 2015 02:26:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by lbzd8 with SMTP id d8so26128012lbz.0 for ; Thu, 09 Jul 2015 02:26:56 -0700 (PDT) X-Received: by 10.112.42.50 with SMTP id k18mr12696967lbl.76.1436434016059; Thu, 09 Jul 2015 02:26:56 -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 hn6csp530622lbb; Thu, 9 Jul 2015 02:26:55 -0700 (PDT) X-Received: by 10.140.151.130 with SMTP id 124mr24602984qhx.18.1436434014885; Thu, 09 Jul 2015 02:26:54 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 40si5458037qkp.22.2015.07.09.02.26.52; Thu, 09 Jul 2015 02:26:54 -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 A6BBB61FB3; Thu, 9 Jul 2015 09:26:52 +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 C1A5461FBD; Thu, 9 Jul 2015 09:25:53 +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 066F061B1F; Thu, 9 Jul 2015 09:25:48 +0000 (UTC) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com [209.85.217.174]) by lists.linaro.org (Postfix) with ESMTPS id DEDC06183B for ; Thu, 9 Jul 2015 09:25:46 +0000 (UTC) Received: by lbzd8 with SMTP id d8so26110402lbz.0 for ; Thu, 09 Jul 2015 02:25:45 -0700 (PDT) X-Received: by 10.112.130.68 with SMTP id oc4mr13500514lbb.87.1436433945855; Thu, 09 Jul 2015 02:25:45 -0700 (PDT) Received: from erachmi-VirtualBox.ki.sw.ericsson.se (c-83-233-90-46.cust.bredband2.com. [83.233.90.46]) by smtp.gmail.com with ESMTPSA id j6sm1265981laj.13.2015.07.09.02.25.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 02:25:44 -0700 (PDT) From: Christophe Milard To: anders.roxell@linaro.org, mike.holmes@linaro.org, stuart.haslam@linaro.org, maxim.uvarov@linaro.org Date: Thu, 9 Jul 2015 11:25:32 +0200 Message-Id: <1436433933-16911-3-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436433933-16911-1-git-send-email-christophe.milard@linaro.org> References: <1436433933-16911-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Cc: lng-odp@lists.linaro.org Subject: [lng-odp] [PATCH 2/3] validation: removed main function from cunit_common 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.179 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 Now that all modules defines their own main(), the dual library builds for cunit_common (one with main(), the other without) is no longer needed. It is therefore removed. Signed-off-by: Christophe Milard --- test/validation/common/Makefile.am | 8 ++------ test/validation/common/odp_cunit_common.c | 8 -------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/test/validation/common/Makefile.am b/test/validation/common/Makefile.am index bd2f214..5548c52 100644 --- a/test/validation/common/Makefile.am +++ b/test/validation/common/Makefile.am @@ -1,10 +1,6 @@ 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 +noinst_LIBRARIES = libcunit_common.a +libcunit_common_a_CFLAGS = $(AM_CFLAGS) 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 56493ac..f0752c6 100644 --- a/test/validation/common/odp_cunit_common.c +++ b/test/validation/common/odp_cunit_common.c @@ -121,11 +121,3 @@ int odp_cunit_run(CU_SuiteInfo testsuites[]) 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