[BZ #3840]

2007-01-12  Ulrich Drepper  <drepper@redhat.com>
	[BZ #3840]
	* scripts/check-local-headers.sh: Restrict to testing .o.d, .os.d,
	and .oS.d files.

diff --git a/ChangeLog b/ChangeLog
index 285667b599a84709b6d71cf4947ae4ac91e4b215..05e4a43deaaa8320763768cf431a22cdd182e5b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-12  Ulrich Drepper  <drepper@redhat.com>
+
+       [BZ #3840]
+       * scripts/check-local-headers.sh: Restrict to testing .o.d, .os.d,
+       and .oS.d files.
+
 2007-01-05  Steven Munroe  <sjmunroe@us.ibm.com>
 
        * stdlib/tst-makecontext.c: Include errno.h.  Change main()

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 83203dab6972430ca37b87a02d53ce7acb195931..eb77263d561ec926a209b6fffcc9e8aff98cddfb 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-12  Ulrich Drepper  <drepper@redhat.com>
+
+       * tst-rwlock7.c: Show some more information in case of correct
+       behavior.
+
 2007-01-11  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h

diff --git a/nptl/tst-rwlock7.c b/nptl/tst-rwlock7.c
index 1f34c06505294d311bad477f0893a81b94782e93..369135b22625d1c01658954282b71dd4d607ec2c 100644 (file)
--- a/nptl/tst-rwlock7.c
+++ b/nptl/tst-rwlock7.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -64,6 +64,7 @@ tf (void *arg)
              strerror (err), err, strerror (ETIMEDOUT), ETIMEDOUT);
       pthread_exit ((void *) 1l);
     }
+  puts ("child: timedwrlock failed with ETIMEDOUT");
 
   struct timeval tv2;
   (void) gettimeofday (&tv2, NULL);
@@ -93,6 +94,7 @@ tf (void *arg)
       puts ("2nd timedwrlock did not return EINVAL");
       pthread_exit ((void *) 1l);
     }
+  puts ("child: timedwrlock failed with EINVAL");
 
   return NULL;
 }
@@ -145,6 +147,7 @@ do_test (void)
          printf ("round %Zu: rwlock_timedrdlock failed\n", cnt);
          exit (1);
        }
+      printf ("%zu: got timedrdlock\n", cnt);
 
       pthread_t th;
       if (pthread_create (&th, NULL, tf, &r) != 0)

diff --git a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh
index 88c85f7106993b973aa9b86ee7c15578c870a5f4..c2d6ba4a08b306238a65b55781e8ee5e380b0f99 100755 (executable)
--- a/scripts/check-local-headers.sh
+++ b/scripts/check-local-headers.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@ cd "$objpfx"
 
 # Search all dependency files for file names in the include directory.
 # There are a few system headers we are known to use.
-if fgrep "$includedir" */*.d |
+if fgrep "$includedir" */*.{o,os,oS}.d |
 fgrep -v "$includedir/asm" |
 fgrep -v "$includedir/linux" |
 fgrep -v "$includedir/selinux" |