[PATCH] test-container: Install with $(sorted-subdirs) [BZ #24794]

Stefan Liebler stli@linux.ibm.com
Thu Jul 25 13:24:00 GMT 2019


Hi Tulio,

with this patch, testroot.pristine contains the missing getent / makedb 
executables and libnss_* libraries.
Now nss/tst-nss-files-hosts-long and all other container tests are passing.

Thanks,
Stefan

On 7/25/19 2:03 AM, Tulio Magno Quites Machado Filho wrote:
> Commit 35e038c1d2ccb3a75395662f9c4f28d85a61444f started to use an
> incomplete list of subdirs based on $(all-subdirs) causing
> testroot.pristine to miss files from nss.
> 
> Tested if the list of files in testroot.pristine remains the same.
> 
> 2019-07-24  Tulio Magno Quites Machado Filho  <tuliom@linux.ibm.com>
> 
> 	[BZ #24794]
> 	* Makeconfig (all-subdirs): Improved source comments.
> 	* Makefile (testroot.pristine/install.stamp): Pass
> 	subdirs='$(sorted-subdirs)' to make install.
> ---
>   Makeconfig | 6 +++---
>   Makefile   | 2 +-
>   2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/Makeconfig b/Makeconfig
> index 0e386fbc19..fd36c58c04 100644
> --- a/Makeconfig
> +++ b/Makeconfig
> @@ -1267,9 +1267,9 @@ else
>   libsupport = $(common-objpfx)support/libsupport.a
>   endif
>   
> -# These are the subdirectories containing the library source.  The order
> -# is more or less arbitrary.  The sorting step will take care of the
> -# dependencies.
> +# This is a partial list of subdirectories containing the library source.
> +# The order is more or less arbitrary.  The sorting step will take care of the
> +# dependencies and generate sorted-subdirs dynamically.
>   all-subdirs = csu assert ctype locale intl catgets math setjmp signal	    \
>   	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
>   	      grp pwd posix io termios resource misc socket sysvipc gmon    \
> diff --git a/Makefile b/Makefile
> index 9fbf705200..ac1125853b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -402,7 +402,7 @@ ifeq ($(run-built-tests),yes)
>   	  done
>   endif
>   	$(MAKE) install DESTDIR=$(objpfx)testroot.pristine \
> -	  subdirs='$(all-subdirs)'
> +	  subdirs='$(sorted-subdirs)'
>   	touch $(objpfx)testroot.pristine/install.stamp
>   
>   tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))
> 



More information about the Libc-alpha mailing list