GNU C Library master sources branch master updated. glibc-2.20-355-g045a6bc

[torvald at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  045a6bcdd2d9c5c83f01171775998ef3104eb10f (commit)
       via  7f786dc12bd60f0a134e538429fef98350e4c814 (commit)
      from  e7e21cba127875de0357079ef44bd14a081b2964 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=045a6bcdd2d9c5c83f01171775998ef3104eb10f

commit 045a6bcdd2d9c5c83f01171775998ef3104eb10f
Author: Torvald Riegel <triegel@redhat.com>
Date:   Tue Jul 29 21:44:58 2014 +0200

    Fix nptl/tst-sem4: always start with a fresh semaphore.

diff --git a/ChangeLog b/ChangeLog
index 07aca34..420ce23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-12-15  Torvald Riegel  <triegel@redhat.com>
 
+	* nptl/tst-sem4.c (do_test): Start with a fresh semaphore state.
+
+2014-12-15  Torvald Riegel  <triegel@redhat.com>
+
 	* nptl/tst-mutex5.c (do_test): Do not skip tests if elision is enabled.
 
 2014-12-15  Adhemerval Zanella  <Azanella@linux.vnet.ibm.com>
diff --git a/nptl/tst-sem4.c b/nptl/tst-sem4.c
index 72ed97d..cf9ef27 100644
--- a/nptl/tst-sem4.c
+++ b/nptl/tst-sem4.c
@@ -39,6 +39,12 @@ do_test (void)
   pid_t pid;
   int val;
 
+  /* Start with a clean slate and register a clean-up action.  No need to
+     act if sem_unlink fails because we will catch the same problem during the
+     sem_open below.  */
+  sem_unlink ("/glibc-tst-sem4");
+  on_exit (remove_sem, (void *) "/glibc-tst-sem4");
+
   s = sem_open ("/glibc-tst-sem4", O_CREAT, 0600, 1);
   if (s == SEM_FAILED)
     {
@@ -59,8 +65,6 @@ do_test (void)
       return 1;
     }
 
-  on_exit (remove_sem, (void *) "/glibc-tst-sem4");
-
   /* We have the semaphore object.  Now try again with O_EXCL, this
      should fail.  */
   s2 = sem_open ("/glibc-tst-sem4", O_CREAT | O_EXCL, 0600, 1);

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7f786dc12bd60f0a134e538429fef98350e4c814

commit 7f786dc12bd60f0a134e538429fef98350e4c814
Author: Torvald Riegel <triegel@redhat.com>
Date:   Mon Dec 15 22:09:55 2014 +0100

    Fix nptl/tst-mutex5.c: Do not skip tests if elision is enabled.

diff --git a/ChangeLog b/ChangeLog
index 50afebc..07aca34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-15  Torvald Riegel  <triegel@redhat.com>
+
+	* nptl/tst-mutex5.c (do_test): Do not skip tests if elision is enabled.
+
 2014-12-15  Adhemerval Zanella  <Azanella@linux.vnet.ibm.com>
 
 	* stdio-common/test-vfprintf.c: Include <libc-internal.h>.
diff --git a/nptl/tst-mutex5.c b/nptl/tst-mutex5.c
index a829272..6988840 100644
--- a/nptl/tst-mutex5.c
+++ b/nptl/tst-mutex5.c
@@ -86,8 +86,6 @@ do_test (void)
       return 1;
     }
 
-  /* Elided locks do not time out.  */
-#ifndef ENABLE_LOCK_ELISION
   if (pthread_mutex_trylock (&m) == 0)
     {
       puts ("mutex_trylock succeeded");
@@ -183,7 +181,6 @@ do_test (void)
       puts ("3rd timedlock didn't return right away");
       return 1;
     }
-#endif
 
   if (pthread_mutex_unlock (&m) != 0)
     {

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    8 ++++++++
 nptl/tst-mutex5.c |    3 ---
 nptl/tst-sem4.c   |    8 ++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources