Adjust test for correct installation

diff --git a/ChangeLog b/ChangeLog
index 9ae8c04c5d92faeab42f8820f505b6edcbd2c559..124e8ffd87993714f29a1ee82757a53320cf000d 100644 (file)
--- 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 0be2e91a8e4bd66db2a1bd44f2b7d53b389e86cc..1abcae1f9dd359b457ffdd9e647d6c5270531d1f 100644 (file)
--- 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 90cd9d754713907a0d1a699cc3d56e05f37a5941..25a919b5add73489c689623c31bb3c338aae4007 100755 (executable)
--- 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;
     }