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 <[email protected]>
yamahata · Jul 23, 2019 · 35e038c · 35e038c
1 parent 95da14d
commit 35e038c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,9 @@
 2019-07-23  Tulio Magno Quites Machado Filho  <[email protected]>
 
+	[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
@@ -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))