From patchwork Thu Jun 4 18:06:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 49546 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EA1D521562 for ; Thu, 4 Jun 2015 18:09:32 +0000 (UTC) Received: by wgez8 with SMTP id z8sf11970176wge.2 for ; Thu, 04 Jun 2015 11:09:32 -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=D1RS/GT1AuFNFIEoSLYSRpfuNQiWGhhWNrbvs0h9WME=; b=EteEVZ3KHnDEmMEGT0uUTsj4Au3rAkcbTUWRSOnu+W3/PMDuHeShSF1v1tnV3Gnhn5 MhAWIVMQfR+lBxBW7+17ybegJvzZ5E77opHAsqAKt9BdO122XwA7GZuZ5ee4uVkTEdK5 BlnIUMz2Sg41mKe+2JUXALT9QpciXED87GyCLP9NkMEVdEMqJJr7iHUxwy/1hXNSy58w VyYRBoLzJ/jPw3nwFXJAyRcXgIt4vNscUSOvqCpfOzix1yvhNyHoyudyTuf+0cRqFf+N Gqa0wXnUmQLslQdY/QvGZkCKc4NEra3E3WmgvokCbgPPHbL0V58zNTUVegcffTzAaeEG 8pMA== X-Gm-Message-State: ALoCoQke7OigSOszLDsc/To+9q1FmDrPSGf6DNmAuvIgtfc7rgmRyyamKTcK0NApbvoZpEGPTH40 X-Received: by 10.112.97.210 with SMTP id ec18mr36655677lbb.15.1433441372158; Thu, 04 Jun 2015 11:09:32 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.178.164 with SMTP id cz4ls262406lac.3.gmail; Thu, 04 Jun 2015 11:09:32 -0700 (PDT) X-Received: by 10.153.7.66 with SMTP id da2mr38704148lad.94.1433441372004; Thu, 04 Jun 2015 11:09:32 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id da7si2504306lad.99.2015.06.04.11.09.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jun 2015 11:09:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbcue7 with SMTP id ue7so32257347lbc.0 for ; Thu, 04 Jun 2015 11:09:31 -0700 (PDT) X-Received: by 10.112.131.98 with SMTP id ol2mr23237193lbb.56.1433441371534; Thu, 04 Jun 2015 11:09:31 -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 hn6csp795049lbb; Thu, 4 Jun 2015 11:09:30 -0700 (PDT) X-Received: by 10.140.108.201 with SMTP id j67mr43557324qgf.79.1433441369695; Thu, 04 Jun 2015 11:09:29 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b109si4866217qgb.73.2015.06.04.11.09.28; Thu, 04 Jun 2015 11:09:29 -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 185676209A; Thu, 4 Jun 2015 18:09:28 +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 6B8AF6208E; Thu, 4 Jun 2015 18:08:13 +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 17AFA6209A; Thu, 4 Jun 2015 18:08:08 +0000 (UTC) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com [209.85.215.42]) by lists.linaro.org (Postfix) with ESMTPS id 9EEB462095 for ; Thu, 4 Jun 2015 18:07:37 +0000 (UTC) Received: by laei3 with SMTP id i3so37594605lae.3 for ; Thu, 04 Jun 2015 11:07:36 -0700 (PDT) X-Received: by 10.152.3.97 with SMTP id b1mr330128lab.54.1433441256510; Thu, 04 Jun 2015 11:07:36 -0700 (PDT) Received: from localhost.localdomain (c-83-233-90-46.cust.bredband2.com. [83.233.90.46]) by mx.google.com with ESMTPSA id x9sm955058lag.18.2015.06.04.11.07.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Jun 2015 11:07:35 -0700 (PDT) From: Christophe Milard To: anders.roxell@linaro.org, mike.holmes@linaro.org, stuart.haslam@linaro.org, maxim.uvarov@linaro.org Date: Thu, 4 Jun 2015 20:06:58 +0200 Message-Id: <1433441220-25295-7-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1433441220-25295-1-git-send-email-christophe.milard@linaro.org> References: <1433441220-25295-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Cc: lng-odp@lists.linaro.org Subject: [lng-odp] [PATCHv3 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.217.173 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: 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 74b067b..96126cb 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