diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-07-23 15:28:31 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-07-23 15:28:31 -0400 |
| commit | 9191c04a7e19fffbea0a08523e579cd8e55142df (patch) | |
| tree | 131d8cfb36363acaa56437b91622b099199d4437 | |
| parent | bba33c289b1b24e1bb3075b7fce5b56c9d01ce2f (diff) | |
| download | glibc-9191c04a7e19fffbea0a08523e579cd8e55142df.tar.gz glibc-9191c04a7e19fffbea0a08523e579cd8e55142df.tar.xz glibc-9191c04a7e19fffbea0a08523e579cd8e55142df.zip | |
Adjust test for correct installation
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rwxr-xr-x | scripts/test-installation.pl | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 9ae8c04c5d..124e8ffd87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-07-23 Ulrich Drepper <drepper@gmail.com> + [BZ #13021] + * scripts/test-installation.pl: Don't expect libnss_test1 to be + installed. + * sysdeps/x86_64/dl-trampoline.S (_dl_runtime_profile): Fix one more typo. (_dl_x86_64_save_sse): Likewise. diff --git a/NEWS b/NEWS index 0be2e91a8e..1abcae1f9d 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -GNU C Library NEWS -- history of user-visible changes. 2011-7-20 +GNU C Library NEWS -- history of user-visible changes. 2011-7-23 Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc. See the end for copying conditions. @@ -9,7 +9,7 @@ Version 2.15 * The following bugs are resolved with this release: - 9696, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007 + 9696, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007, 13021 * New program pldd to list loaded object of a process Implemented by Ulrich Drepper. diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl index 90cd9d7547..25a919b5ad 100755 --- a/scripts/test-installation.pl +++ b/scripts/test-installation.pl @@ -1,5 +1,5 @@ #! /usr/bin/perl -w -# Copyright (C) 1997, 1998, 1999, 2004 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 1999, 2004, 2011 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1997. @@ -105,8 +105,10 @@ while (<SOVERSIONS>) { # - libdb1 since it conflicts with libdb # - libnss1_* from glibc-compat add-on # - libthread_db since it contains unresolved references + # - it's just a test NSS module if ($name ne "nss_ldap" && $name ne "db1" - && !($name =~/^nss1_/) && $name ne "thread_db") { + && !($name =~/^nss1_/) && $name ne "thread_db" + && $name ne "nss_test1") { $link_libs .= " -l$name"; $versions{$name} = $version; } |