qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Tulio Magno Quites Machado Filho 2019-07-22 17:34:13 -03:00
parent 95da14dac0
commit 35e038c1d2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2019-07-23 Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com> 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 * Makefile (testroot.pristine/install.stamp): Execute ld.so with
the same arguments used in all tests. the same arguments used in all tests.

3
Makefile
View File

@ -401,7 +401,8 @@ ifeq ($(run-built-tests),yes)
$(test-wrapper) cp $$dso $(objpfx)testroot.pristine$$dso ;\ $(test-wrapper) cp $$dso $(objpfx)testroot.pristine$$dso ;\
done done
endif endif
$(MAKE) install DESTDIR=$(objpfx)testroot.pristine $(MAKE) install DESTDIR=$(objpfx)testroot.pristine \
subdirs='$(all-subdirs)'
touch $(objpfx)testroot.pristine/install.stamp touch $(objpfx)testroot.pristine/install.stamp
tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special)) tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))