From patchwork Wed Jun 10 16:54:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 49718 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 124A0245D4 for ; Wed, 10 Jun 2015 16:58:08 +0000 (UTC) Received: by wibdt2 with SMTP id dt2sf14201548wib.3 for ; Wed, 10 Jun 2015 09:58:07 -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=Fg2kH0Q1iBrzySQoa97gtjqIR1v6ZZeb+faNU2qiX14=; b=Ca6yu1GWPqqhJzysfujOpm4hrvp4+kJFljp1Zcuosnx2W4T6jxEhgRdMTdUwTN/27C SsJblOFeMHLFxPu5eNfuyvRQYkEfur7A9Hn0zqziHsfjB5rN8/UvHFV1pPNh0zsbNOmc +tiA+0sPHGEQc7BvnDHRxAbW/fiTGXnkFMdLeYj9ti3xkBiFja7dPlKik/ysy5sGCbxz xxpFrHrBtnCA4yqcaKKdXEv5gFDJ9sq5WERCskOuncNK6FBBBdHMwt9ee5SNQ7TDXxIT wBXsDhHpoIwqvFchEaMy0KPAsU1V+263BWB1Pdx5rrV6lflrUmBXcnUvE3k3aRbpXGB3 lpfg== X-Gm-Message-State: ALoCoQk8VC38N5MYHidvODREFPJl4lymU/Zr8B6MfPQpfTm+mxJMoMV6A8WvqOzki077CmeuziEY X-Received: by 10.152.19.161 with SMTP id g1mr3781280lae.8.1433955487358; Wed, 10 Jun 2015 09:58:07 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.9.7 with SMTP id v7ls260486laa.75.gmail; Wed, 10 Jun 2015 09:58:07 -0700 (PDT) X-Received: by 10.152.225.166 with SMTP id rl6mr5180144lac.36.1433955487132; Wed, 10 Jun 2015 09:58:07 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id w10si9504141law.138.2015.06.10.09.58.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jun 2015 09:58:07 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by labpy14 with SMTP id py14so37538957lab.0 for ; Wed, 10 Jun 2015 09:58:07 -0700 (PDT) X-Received: by 10.152.1.40 with SMTP id 8mr5269273laj.56.1433955486896; Wed, 10 Jun 2015 09:58:06 -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 hn6csp3462022lbb; Wed, 10 Jun 2015 09:58:05 -0700 (PDT) X-Received: by 10.140.97.72 with SMTP id l66mr5204582qge.103.1433955485328; Wed, 10 Jun 2015 09:58:05 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id x77si9282762qkx.17.2015.06.10.09.58.04; Wed, 10 Jun 2015 09:58:05 -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 02F5561B59; Wed, 10 Jun 2015 16:58:03 +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 BCA2461F74; Wed, 10 Jun 2015 16:55:41 +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 186F461B59; Wed, 10 Jun 2015 16:55:28 +0000 (UTC) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com [209.85.217.169]) by lists.linaro.org (Postfix) with ESMTPS id 33B5761F68 for ; Wed, 10 Jun 2015 16:55:00 +0000 (UTC) Received: by lbbtu8 with SMTP id tu8so32529963lbb.2 for ; Wed, 10 Jun 2015 09:54:59 -0700 (PDT) X-Received: by 10.112.125.166 with SMTP id mr6mr5105784lbb.83.1433955299110; Wed, 10 Jun 2015 09:54:59 -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 i1sm2328544lae.45.2015.06.10.09.54.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jun 2015 09:54:58 -0700 (PDT) From: Christophe Milard To: anders.roxell@linaro.org, mike.holmes@linaro.org, stuart.haslam@linaro.org, maxim.uvarov@linaro.org Date: Wed, 10 Jun 2015 18:54:23 +0200 Message-Id: <1433955265-4180-7-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433955265-4180-1-git-send-email-christophe.milard@linaro.org> References: <1433955265-4180-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Cc: lng-odp@lists.linaro.org Subject: [lng-odp] [PATCHv5 6/8] validation: changing build order 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.54 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 When tests will be ran from the platform side, they will use platform agnostic tests from the validation side: i.e. -the validation side must be build before the platform test side. And the platform agnostic tests uses ODP. The building order must therefore be as follows: 1) (i.e. ODP) 2) validation (i.e. common tests) 3) /test (i.e. the platform specific test setup and tests) Saddly, writing SUBDIRS=platform/@with_platform@ does not work with autotools, which leads to a bit of clutter in configure.ac. Hopefully changed if things move around in the future... Signed-off-by: Christophe Milard Reviewed-by: Mike Holmes Reviewed-by: Stuart Haslam --- Makefile.am | 9 ++++++++- configure.ac | 3 ++- platform/Makefile.am | 1 - platform/linux-generic/Makefile.am | 2 -- 4 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 platform/Makefile.am diff --git a/Makefile.am b/Makefile.am index b9b2517..2c8a9d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,14 @@ ACLOCAL_AMFLAGS=-I m4 AUTOMAKE_OPTIONS = foreign -SUBDIRS = doc platform example test helper scripts +#@with_platform@ works alone in subdir but not as part of a path??? +SUBDIRS = @platform_with_platform@ \ + test \ + @platform_with_platform_test@ \ + helper \ + doc \ + example \ + scripts include $(top_srcdir)/aminclude.am diff --git a/configure.ac b/configure.ac index 8faf5e1..ffc23c8 100644 --- a/configure.ac +++ b/configure.ac @@ -76,6 +76,8 @@ AC_ARG_WITH([platform], ]) AC_SUBST([with_platform]) +AC_SUBST([platform_with_platform], ["platform/${with_platform}"]) +AC_SUBST([platform_with_platform_test], ["platform/${with_platform}/test"]) if test "${with_platform}" == "linux-generic"; then @@ -294,7 +296,6 @@ AC_CONFIG_FILES([Makefile helper/Makefile helper/test/Makefile pkgconfig/libodp.pc - platform/Makefile platform/linux-generic/Makefile scripts/Makefile test/Makefile diff --git a/platform/Makefile.am b/platform/Makefile.am deleted file mode 100644 index e618747..0000000 --- a/platform/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = @with_platform@ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 66f0474..b8f93c7 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -5,8 +5,6 @@ AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_srcdir)/helper/include -SUBDIRS = test - include_HEADERS = \ $(top_srcdir)/include/odp.h