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

diff --git a/ChangeLog b/ChangeLog
index 50afebc..07aca34 100644 (file)
--- 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 (file)
--- 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)
     {