diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-01-12 17:02:22 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-01-12 17:02:22 +0000 |
| commit | 8980796b15969fe84bd6bf5cd9eece93eaf62109 (patch) | |
| tree | 7f433b682232e71419dfb3619e4cf382df4120be | |
| parent | a1d87b5dfbdd951808b0a83dfa6d2f1654ccb37f (diff) | |
| download | glibc-8980796b15969fe84bd6bf5cd9eece93eaf62109.tar.gz glibc-8980796b15969fe84bd6bf5cd9eece93eaf62109.tar.xz glibc-8980796b15969fe84bd6bf5cd9eece93eaf62109.zip | |
[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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/tst-rwlock7.c | 5 | ||||
| -rwxr-xr-x | scripts/check-local-headers.sh | 4 |
4 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 285667b599..05e4a43dea 100644 --- 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 83203dab69..eb77263d56 100644 --- 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 1f34c06505..369135b226 100644 --- 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 88c85f7106..c2d6ba4a08 100755 --- 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" | |