diff options
| author | Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com> | 2019-07-22 17:34:13 -0300 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com> | 2019-07-23 10:14:26 -0300 |
| commit | 35e038c1d2ccb3a75395662f9c4f28d85a61444f (patch) | |
| tree | 2d896531648d33aa7078f90bf15f84979f2e1e9d | |
| parent | 95da14dac04b494149290d85bc5306226e30839e (diff) | |
| download | glibc-35e038c1d2ccb3a75395662f9c4f28d85a61444f.tar.gz glibc-35e038c1d2ccb3a75395662f9c4f28d85a61444f.tar.xz glibc-35e038c1d2ccb3a75395662f9c4f28d85a61444f.zip | |
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>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 8d4c898830..78c3c61d2e 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 a4ed747cef..9fbf705200 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)) |