diff mbox

[PATCHv4,6/8] validation: changing build order

Message ID 1433850261-1302-7-git-send-email-christophe.milard@linaro.org
State Superseded
Headers show

Commit Message

Christophe Milard June 9, 2015, 11:44 a.m. UTC 
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) <platform> (i.e. ODP)
2) validation (i.e. common tests)
3) <platform>/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 <christophe.milard@linaro.org>
Reviewed-by: Stuart Haslam <stuart.haslam@linaro.org>
---
 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 mbox

Patch

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