Skip to contentSkip to conversation

Makefile.am: add mkdir testsuite and standaline build target

PATCH In review Saul Wold 2 participants 6 messages Oct 9, 2013 – Oct 10, 2013 Kbuild

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

PATCH 1/1 Makefile.am: add mkdir testsuite and standaline build target

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(-)
Makefile.am +4 -1
index c165868..018e6ed 100644
@@ -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
 # ------------------------------------------------------------------------------
Signature · 1 line
1.8.3.1
#1 lore raw

Hi Saul,

Quoted 16 lines · 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(-)
Makefile.am +0 -0
index c165868..018e6ed 100644

Makefile.am endif · line 134

Quoted 5 lines
Makefile.am +1 -1
@@ -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)

Makefile.am DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --sysconfdir=/etc --with-zlib · line 222

Quoted 10 lines
Makefile.am +3 -0
                                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)
+

Makes sense. Splitting the patch would be good.

Thanks
Lucas De Marchi

author
#2 lore raw
Quoted 28 lines · Lucas De Marchi

Hi Saul,

Quoted 16 lines · 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(-)
Makefile.am +0 -0
index c165868..018e6ed 100644

Makefile.am endif · line 134

Quoted 5 lines
Makefile.am +1 -1
@@ -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:

Quoted 8 lines
$ ./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.

Quoted 5 lines
Quoted 5 lines
Makefile.am +0 -0
                                 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
 
Quoted 8 lines

Makefile.am DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --sysconfdir=/etc --with-zlib · line 222

Quoted 5 lines
Makefile.am +3 -0
  distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
+buildtest-TESTS:
+       $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
+

Makes sense. Splitting the patch would be good.

Do you still want this split based on the above observation?

Sau!

Quoted 3 lines

Thanks
Lucas De Marchi

#3 lore raw
Quoted 37 lines · Saul Wold
Quoted 36 lines · Lucas De Marchi

Hi Saul,

Quoted 17 lines · 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(-)
Makefile.am +0 -0
index c165868..018e6ed 100644

Makefile.am endif · line 135

Quoted 6 lines
Makefile.am +1 -1
@@ -131,7 +131,7 @@ endif
 
  ROOTFS =3D testsuite/rootfs
  ROOTFS_PRISTINE =3D $(top_srcdir)/testsuite/rootfs-pristine
-CREATE_ROOTFS =3D $(AM_V_GEN) ( $(RM) -rf $(ROOTFS) && \
+CREATE_ROOTFS =3D $(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=3D/etc --with-zlib && make -j10 check
Quoted 5 lines
Quoted 4 lines

You really need the --sysconfdir=3D/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

Quoted 1 line

target, I create an installable package that includes the rootfs and test=

s,

Quoted 2 lines

to this I run make rootfs on the build machine, can you veify that that works in a clean build directory?

The testsuite directory is being created here during configure, even before any make or make check. See below:

=E2=94=94 build2 =E2=9E=A4 pwd
/tmp/build2
=E2=94=94 build2 =E2=9E=A4 ls -l
total 0
=E2=94=94 build2 =E2=9E=A4 /home/lucas/p/kmod/configure --prefix=3D/usr --sysconfdir=3D/etc --libdir=3D/usr/lib --enable-debug --with-xz --with-zlib
=E2=94=94 build2 =E2=9E=A4 find .
.
./libtool
./tools
./tools/.deps
./tools/.deps/static-nodes.Po
./tools/.deps/rmmod.Po
./tools/.deps/modprobe.Po
./tools/.deps/modinfo.Po
./tools/.deps/lsmod.Po
./tools/.deps/log.Po
./tools/.deps/kmod.Po
./tools/.deps/insmod.Po
./tools/.deps/depmod.Po
./testsuite
./testsuite/.deps
./testsuite/.deps/uname.Plo ./testsuite/.deps/testsuite_test_testsuite-test-testsuite.Po ./testsuite/.deps/testsuite_test_new_module-test-new-module.Po ./testsuite/.deps/testsuite_test_modprobe-test-modprobe.Po ./testsuite/.deps/testsuite_test_modinfo-test-modinfo.Po ./testsuite/.deps/testsuite_test_loaded-test-loaded.Po ./testsuite/.deps/testsuite_test_init-test-init.Po ./testsuite/.deps/testsuite_test_depmod-test-depmod.Po ./testsuite/.deps/testsuite_test_dependencies-test-dependencies.Po ./testsuite/.deps/testsuite_test_blacklist-test-blacklist.Po ./testsuite/.deps/testsuite_test_alias-test-alias.Po ./testsuite/.deps/testsuite_libtestsuite_la-testsuite.Plo ./testsuite/.deps/path.Plo
./testsuite/.deps/init_module.Plo ./testsuite/.deps/delete_module.Plo
./stamp-h1
./config.h
./libkmod
./libkmod/.deps
./libkmod/.deps/libkmod.Plo
./libkmod/.deps/libkmod-util.Plo ./libkmod/.deps/libkmod-signature.Plo ./libkmod/.deps/libkmod-module.Plo ./libkmod/.deps/libkmod-list.Plo ./libkmod/.deps/libkmod-index.Plo ./libkmod/.deps/libkmod-hash.Plo ./libkmod/.deps/libkmod-file.Plo ./libkmod/.deps/libkmod-elf.Plo ./libkmod/.deps/libkmod-config.Plo ./libkmod/.deps/libkmod-array.Plo
./libkmod/docs
./libkmod/docs/version.xml
./libkmod/docs/Makefile
./man
./man/Makefile
./Makefile
./config.status
./config.log

Quoted 2 lines

Since the make check above will create the testsuite directory and build =

all

Quoted 1 line

the tests before rootfs target is called, in my case that does not happen=

.

Quoted 4 lines
Quoted 4 lines

Makefile.am endif · line 136

Quoted 4 lines
Makefile.am +0 -0
                                 cp -r $(ROOTFS_PRISTINE) $(ROOTFS) && =

\

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Makefile.am +0 -0
                                 touch testsuite/stamp-rootfs && \
                                 find $(ROOTFS) -type d -exec chmod +w =

{}

Quoted 14 lines
Quoted 4 lines
Quoted 4 lines

\; )

Makefile.am +0 -1
@@ -217,6 +217,9 @@ DISTCHECK_CONFIGURE_FLAGS=3D--enable-gtk-doc
--sysconfdir=3D/etc --with-zlib
 
Quoted 9 lines

Makefile.am DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --sysconfdir=/etc --with-zlib · line 222

Quoted 5 lines
Makefile.am +3 -0
  distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
+buildtest-TESTS:
+       $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
+

Makes sense. Splitting the patch would be good.

Quoted 1 line

Do you still want this split based on the above observation?

Yes, it's better.

thanks
Lucas De Marchi

author
#4 lore raw
Quoted 42 lines · Lucas De Marchi
Quoted 41 lines · Saul Wold
Quoted 40 lines · Lucas De Marchi

Hi Saul,

Quoted 17 lines · 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(-)
Makefile.am +0 -0
index c165868..018e6ed 100644

Makefile.am endif · line 135

Quoted 6 lines
Makefile.am +1 -1
@@ -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)

Quoted 8 lines
Quoted 4 lines

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?

The testsuite directory is being created here during configure, even before any make or make check. See below:

Not in all cases, it depends on the way configure is called. I am working with bitbake and oe-core, and we call configure with --disable-dependency-tracking by default. That's what generates the .deps and .Po files and creates the directories.

In my case after a configure toplevel build is:

~/yocto/builds/world/tmp/work/x86_64-poky-linux/kmod/14+gitAUTOINC+3b38c7 fcb5-r0/git$ ls ../build/

Makefile      config.h    config.status  man       x86_64-poky-linux-libtool
aclocal-copy  config.log  libkmod        stamp-h1

Notice no tools, testsuite or libkmod yet.

Sau!

Quoted 94 lines

└ build2 ➤ pwd
/tmp/build2
└ build2 ➤ ls -l
total 0
└ build2 ➤ /home/lucas/p/kmod/configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib --enable-debug --with-xz --with-zlib
└ build2 ➤ find .
.
./libtool
./tools
./tools/.deps
./tools/.deps/static-nodes.Po
./tools/.deps/rmmod.Po
./tools/.deps/modprobe.Po
./tools/.deps/modinfo.Po
./tools/.deps/lsmod.Po
./tools/.deps/log.Po
./tools/.deps/kmod.Po
./tools/.deps/insmod.Po
./tools/.deps/depmod.Po
./testsuite
./testsuite/.deps
./testsuite/.deps/uname.Plo ./testsuite/.deps/testsuite_test_testsuite-test-testsuite.Po ./testsuite/.deps/testsuite_test_new_module-test-new-module.Po ./testsuite/.deps/testsuite_test_modprobe-test-modprobe.Po ./testsuite/.deps/testsuite_test_modinfo-test-modinfo.Po ./testsuite/.deps/testsuite_test_loaded-test-loaded.Po ./testsuite/.deps/testsuite_test_init-test-init.Po ./testsuite/.deps/testsuite_test_depmod-test-depmod.Po ./testsuite/.deps/testsuite_test_dependencies-test-dependencies.Po ./testsuite/.deps/testsuite_test_blacklist-test-blacklist.Po ./testsuite/.deps/testsuite_test_alias-test-alias.Po ./testsuite/.deps/testsuite_libtestsuite_la-testsuite.Plo ./testsuite/.deps/path.Plo ./testsuite/.deps/init_module.Plo ./testsuite/.deps/delete_module.Plo
./stamp-h1
./config.h
./libkmod
./libkmod/.deps
./libkmod/.deps/libkmod.Plo ./libkmod/.deps/libkmod-util.Plo ./libkmod/.deps/libkmod-signature.Plo ./libkmod/.deps/libkmod-module.Plo ./libkmod/.deps/libkmod-list.Plo ./libkmod/.deps/libkmod-index.Plo ./libkmod/.deps/libkmod-hash.Plo ./libkmod/.deps/libkmod-file.Plo ./libkmod/.deps/libkmod-elf.Plo ./libkmod/.deps/libkmod-config.Plo ./libkmod/.deps/libkmod-array.Plo
./libkmod/docs
./libkmod/docs/version.xml
./libkmod/docs/Makefile
./man
./man/Makefile
./Makefile
./config.status
./config.log

Quoted 23 lines

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.

Quoted 7 lines
Quoted 7 lines
Makefile.am +0 -0
                                  cp -r $(ROOTFS_PRISTINE) $(ROOTFS) && \
                                  touch testsuite/stamp-rootfs && \
                                  find $(ROOTFS) -type d -exec chmod +w {}

\; )

Makefile.am +0 -1
@@ -217,6 +217,9 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
--sysconfdir=/etc --with-zlib
 
Quoted 9 lines

Makefile.am DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --sysconfdir=/etc --with-zlib · line 222

Quoted 5 lines
Makefile.am +3 -0
   distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
+buildtest-TESTS:
+       $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
+

Makes sense. Splitting the patch would be good.

Quoted 1 line

Do you still want this split based on the above observation?

Yes, it's better.

thanks
Lucas De Marchi

#5 lore raw
Quoted 66 lines · Saul Wold
Quoted 55 lines · Lucas De Marchi
Quoted 45 lines · Saul Wold
Quoted 35 lines · Lucas De Marchi

Hi Saul,

Quoted 18 lines · 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(-)
Makefile.am +0 -0
index c165868..018e6ed 100644

Makefile.am endif · line 135

Quoted 6 lines
Makefile.am +1 -1
@@ -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:

Quoted 8 lines
$ ./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)

Quoted 6 lines

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?

Quoted 3 lines

The testsuite directory is being created here during configure, even before any make or make check. See below:

Not in all cases, it depends on the way configure is called. I am working with bitbake and oe-core, and we call configure with --disable-dependency-tracking by default. That's what generates the .deps and .Po files and creates the directories.

In my case after a configure toplevel build is:

Quoted 7 lines

~/yocto/builds/world/tmp/work/x86_64-poky-linux/kmod/14+gitAUTOINC+3b38c7 fcb5-r0/git$ ls ../build/

Makefile      config.h    config.status  man       x86_64-poky-linux-libtool
aclocal-copy  config.log  libkmod        stamp-h1

Notice no tools, testsuite or libkmod yet.

Ok. Now it makes more sense. Let's write this down into the commit message then.

Also notice we don't use signed-off-by

Thanks
Lucas De Marchi