From: Torvald Riegel <triegel@redhat.com>
Date: Mon, 15 Dec 2014 21:09:55 +0000 (+0100)
Subject: Fix nptl/tst-mutex5.c: Do not skip tests if elision is enabled.
X-Git-Tag: glibc-2.21~229
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f786dc12bd60f0a134e538429fef98350e4c814;p=thirdparty%2Fglibc.git

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

diff --git a/ChangeLog b/ChangeLog
index 50afebc3c42..07aca34dd07 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 a8292727419..69888409871 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)
     {