[PATCH] Makefile.am: add mkdir testsuite and standaline build target

Discussion:

Saul Wold

2013-10-09 22:53:47 UTC

If we are not building in the existing source tree, the testsuite
directory will not exist so the cp of the stamp-rootfs would fail.

Also added buildtest-TESTS so they could be build in the cross env,
without running the tests.

Signed-off-by: Saul Wold <sgw-VuQAYsv1563Yd54FQh9/***@public.gmane.org>
---
Makefile.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index c165868..018e6ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,7 +131,7 @@ endif

ROOTFS = testsuite/rootfs
ROOTFS_PRISTINE = $(top_srcdir)/testsuite/rootfs-pristine
-CREATE_ROOTFS = $(AM_V_GEN) ( $(RM) -rf $(ROOTFS) && \
+CREATE_ROOTFS = $(AM_V_GEN) ( $(RM) -rf $(ROOTFS) && mkdir -p $(dir $(ROOTFS)) && \
cp -r $(ROOTFS_PRISTINE) $(ROOTFS) && \
touch testsuite/stamp-rootfs && \
find $(ROOTFS) -type d -exec chmod +w {} \; )
@@ -217,6 +217,9 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --sysconfdir=/etc --with-zlib

distclean-local: $(DISTCLEAN_LOCAL_HOOKS)

+buildtest-TESTS:
+ $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
+
# ------------------------------------------------------------------------------
# custom release helpers
# ------------------------------------------------------------------------------

--
1.8.3.1

Lucas De Marchi

2013-10-09 23:30:44 UTC

Permalink

Hi Saul,

Post by Saul Wold
If we are not building in the existing source tree, the testsuite
directory will not exist so the cp of the stamp-rootfs would fail.
Also added buildtest-TESTS so they could be build in the cross env,
without running the tests.
---
Makefile.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index c165868..018e6ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,7 +131,7 @@ endif
ROOTFS = testsuite/rootfs
ROOTFS_PRISTINE = $(top_srcdir)/testsuite/rootfs-pristine
-CREATE_ROOTFS = $(AM_V_GEN) ( $(RM) -rf $(ROOTFS) && \
+CREATE_ROOTFS = $(AM_V_GEN) ( $(RM) -rf $(ROOTFS) && mkdir -p $(dir $(ROOTFS)) && \

I think it's something else that's causing a failure for you. The
following works for me:

$ ./autogen.sh
$ cd /tmp/build
$ $OLDPWD/configure --sysconfdir=/etc --with-zlib && make -j10 check

You really need the --sysconfdir=/etc and --with-zlib otherwise some
tests will fail. These are the flags we pass to distcheck, that also
builds out of tree (but in an inner directory)

Post by Saul Wold
cp -r $(ROOTFS_PRISTINE) $(ROOTFS) && \
touch testsuite/stamp-rootfs && \
find $(ROOTFS) -type d -exec chmod +w {} \; )
@@ -217,6 +217,9 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --sysconfdir=/etc --with-zlib
distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
+ $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
+

Makes sense. Splitting the patch would be good.

Thanks
Lucas De Marchi

Saul Wold

2013-10-10 00:39:24 UTC

Permalink

Post by Lucas De Marchi
Hi Saul,

I think it's something else that's causing a failure for you. The
$ ./autogen.sh
$ cd /tmp/build
$ $OLDPWD/configure --sysconfdir=/etc --with-zlib && make -j10 check
You really need the --sysconfdir=/etc and --with-zlib otherwise some
tests will fail. These are the flags we pass to distcheck, that also
builds out of tree (but in an inner directory)

Since I am not running check on the build machine, I am running check on
the target, I create an installable package that includes the rootfs and
tests, to this I run make rootfs on the build machine, can you veify
that that works in a clean build directory?

Since the make check above will create the testsuite directory and build
all the tests before rootfs target is called, in my case that does not
happen.