Message ID | 20170810122423.B1965439942E1@oldenburg.str.redhat.com |
---|---|
State | New |
Headers | show |
On 08/10/2017 02:24 PM, Florian Weimer wrote: > 2017-08-10 Florian Weimer<fweimer@redhat.com> > > [BZ #21911] > * scripts/test-installation.pl: Ignore nss_test* DSOs. Ping? <https://sourceware.org/ml/libc-alpha/2017-08/msg00390.html> Thanks, Florian
On 08/10/2017 05:24 AM, Florian Weimer wrote: > 2017-08-10 Florian Weimer <fweimer@redhat.com> > > [BZ #21911] > * scripts/test-installation.pl: Ignore nss_test* DSOs. > > diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl > index c5b9fdefd2..4b0e9f3c4a 100755 > --- a/scripts/test-installation.pl > +++ b/scripts/test-installation.pl > @@ -124,7 +124,7 @@ while (<SOVERSIONS>) { > next if ($build_mathvec == 0 && $name eq "mvec"); > if ($name ne "nss_ldap" && $name ne "db1" > && !($name =~/^nss1_/) && $name ne "thread_db" > - && $name ne "nss_test1" && $name ne "libgcc_s") { > + && $name !~ /^nss_test\d+/ && $name ne "libgcc_s") { > $link_libs .= " -l$name"; > $versions{$name} = $version; > } An anchor would more closely preserve the test (i.e., "/^nss_test\d+$/"), and avoid matches like "nss_test9 garb @ g3". Rical
On 10/07/2017 12:55 PM, Rical Jasan wrote: > On 08/10/2017 05:24 AM, Florian Weimer wrote: >> 2017-08-10 Florian Weimer <fweimer@redhat.com> >> >> [BZ #21911] >> * scripts/test-installation.pl: Ignore nss_test* DSOs. >> >> diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl >> index c5b9fdefd2..4b0e9f3c4a 100755 >> --- a/scripts/test-installation.pl >> +++ b/scripts/test-installation.pl >> @@ -124,7 +124,7 @@ while (<SOVERSIONS>) { >> next if ($build_mathvec == 0 && $name eq "mvec"); >> if ($name ne "nss_ldap" && $name ne "db1" >> && !($name =~/^nss1_/) && $name ne "thread_db" >> - && $name ne "nss_test1" && $name ne "libgcc_s") { >> + && $name !~ /^nss_test\d+/ && $name ne "libgcc_s") { >> $link_libs .= " -l$name"; >> $versions{$name} = $version; >> } > > An anchor would more closely preserve the test (i.e., > "/^nss_test\d+$/"), and avoid matches like "nss_test9 garb @ g3". Good point. Updated patch attached. Thanks, Florian 2017-10-10 Florian Weimer <fweimer@redhat.com> [BZ #21911] * scripts/test-installation.pl: Ignore nss_test* DSOs. diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl index 45c666b0a2..74d25e1c8d 100755 --- a/scripts/test-installation.pl +++ b/scripts/test-installation.pl @@ -123,7 +123,7 @@ while (<SOVERSIONS>) { next if ($build_mathvec == 0 && $name eq "mvec"); if ($name ne "nss_ldap" && $name ne "db1" && $name ne "thread_db" - && $name ne "nss_test1" && $name ne "libgcc_s") { + && $name !~ /^nss_test\d+$/ && $name ne "libgcc_s") { $link_libs .= " -l$name"; $versions{$name} = $version; }
diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl index c5b9fdefd2..4b0e9f3c4a 100755 --- a/scripts/test-installation.pl +++ b/scripts/test-installation.pl @@ -124,7 +124,7 @@ while (<SOVERSIONS>) { next if ($build_mathvec == 0 && $name eq "mvec"); if ($name ne "nss_ldap" && $name ne "db1" && !($name =~/^nss1_/) && $name ne "thread_db" - && $name ne "nss_test1" && $name ne "libgcc_s") { + && $name !~ /^nss_test\d+/ && $name ne "libgcc_s") { $link_libs .= " -l$name"; $versions{$name} = $version; }