]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
test-container: Install with $(all-subdirs) [BZ #24794]
authorTulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
Mon, 22 Jul 2019 20:34:13 +0000 (17:34 -0300)
committerH.J. Lu <hjl.tools@gmail.com>
Thu, 27 Jan 2022 15:28:12 +0000 (07:28 -0800)
Whenever a sub-make is created, it inherits the variable subdirs from its
parent.  This is also true when make check is called with a restricted
list of subdirs.  In this scenario, make install is executed "partially"
and testroot.pristine ends up with an incomplete installation.

[BZ #24794]
* Makefile (testroot.pristine/install.stamp): Pass
subdirs='$(all-subdirs)' to make install.

Reviewed-by: DJ Delorie <dj@redhat.com>
(cherry picked from commit 35e038c1d2ccb3a75395662f9c4f28d85a61444f)

Makefile

index 4a014d6effdecde830369c69913e08c04e48eb8f..723aa0e456c547003181ad7760d58acc7d067db6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -395,7 +395,8 @@ ifeq ($(run-built-tests),yes)
            $(test-wrapper) cp $$dso $(objpfx)testroot.pristine$$dso ;\
          done
 endif
-       $(MAKE) install DESTDIR=$(objpfx)testroot.pristine
+       $(MAKE) install DESTDIR=$(objpfx)testroot.pristine \
+         subdirs='$(all-subdirs)'
        touch $(objpfx)testroot.pristine/install.stamp
 
 tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))