| Message ID | 20190725000323.15612-1-tuliom@linux.ibm.com |
|---|---|
| State | Committed |
| Delegated to: | Carlos O'Donell |
| Headers |
Received: (qmail 53267 invoked by alias); 25 Jul 2019 00:03:53 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: <libc-alpha.sourceware.org> List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org> List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org> List-Archive: <http://sourceware.org/ml/libc-alpha/> List-Post: <mailto:libc-alpha@sourceware.org> List-Help: <mailto:libc-alpha-help@sourceware.org>, <http://sourceware.org/ml/#faqs> Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 51484 invoked by uid 89); 25 Jul 2019 00:03:42 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy=csu X-HELO: mx0a-001b2d01.pphosted.com From: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com> To: Stefan Liebler <stli@linux.ibm.com>, libc-alpha@sourceware.org Subject: [PATCH] test-container: Install with $(sorted-subdirs) [BZ #24794] Date: Wed, 24 Jul 2019 21:03:23 -0300 In-Reply-To: <87k1c7zbw2.fsf@linux.ibm.com> References: <87k1c7zbw2.fsf@linux.ibm.com> x-cbid: 19072500-0012-0000-0000-000017560B3F X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00011489; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000287; SDB=6.01236986; UDB=6.00652010; IPR=6.01018352; MB=3.00027877; MTD=3.00000008; XFM=3.00000015; UTC=2019-07-25 00:03:37 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19072500-0013-0000-0000-000058343F71 Message-Id: <20190725000323.15612-1-tuliom@linux.ibm.com> |
Commit Message
Tulio Magno Quites Machado Filho
July 25, 2019, 12:03 a.m. UTC
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(-)
Comments
On 25/07/2019 01:03, 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. fwiw with this patch aarch64 buildbot would go back to green. > > 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)) >
On 7/25/19 8:46 AM, Szabolcs Nagy wrote: > On 25/07/2019 01:03, 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. > > fwiw with this patch aarch64 buildbot would go back to green. This is good enough confirmation for me. Please install the fix so we can get clean builds for the release. >> >> 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)) >> >
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)) >
Carlos O'Donell <carlos@redhat.com> writes: > On 7/25/19 8:46 AM, Szabolcs Nagy wrote: >> On 25/07/2019 01:03, 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. >> >> fwiw with this patch aarch64 buildbot would go back to green. > > This is good enough confirmation for me. > > Please install the fix so we can get clean builds for the release. I've just pushed it to master. DJ, I took the freedom to add your name to the ChangeLog file too as you proposed the same fix. ;-) Pushed as 354e4c1adddb1.
On Mon, Jul 29, 2019 at 6:37 AM Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com> wrote: > > Carlos O'Donell <carlos@redhat.com> writes: > > > On 7/25/19 8:46 AM, Szabolcs Nagy wrote: > >> On 25/07/2019 01:03, 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. > >> > >> fwiw with this patch aarch64 buildbot would go back to green. > > > > This is good enough confirmation for me. > > > > Please install the fix so we can get clean builds for the release. > > I've just pushed it to master. > > DJ, > I took the freedom to add your name to the ChangeLog file too as you proposed > the same fix. ;-) > > Pushed as 354e4c1adddb1. > > -- > Tulio Magno I am backporting this to older release branches.
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))