This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[glibc] test-container: Install with $(all-subdirs) [BZ #24794]


https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=35e038c1d2ccb3a75395662f9c4f28d85a61444f

commit 35e038c1d2ccb3a75395662f9c4f28d85a61444f
Author: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
Date:   Mon Jul 22 17:34:13 2019 -0300

    test-container: Install with $(all-subdirs) [BZ #24794]
    
    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>

Diff:
---
 ChangeLog | 4 ++++
 Makefile  | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8d4c898..78c3c61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2019-07-23  Tulio Magno Quites Machado Filho  <tuliom@linux.ibm.com>
 
+	[BZ #24794]
+	* Makefile (testroot.pristine/install.stamp): Pass
+	subdirs='$(all-subdirs)' to make install.
+
 	* Makefile (testroot.pristine/install.stamp): Execute ld.so with
 	the same arguments used in all tests.
 
diff --git a/Makefile b/Makefile
index a4ed747..9fbf705 100644
--- a/Makefile
+++ b/Makefile
@@ -401,7 +401,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))


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]