diff options
| author | Torvald Riegel <triegel@redhat.com> | 2014-12-15 22:09:55 +0100 |
|---|---|---|
| committer | Torvald Riegel <triegel@redhat.com> | 2014-12-15 22:14:32 +0100 |
| commit | 7f786dc12bd60f0a134e538429fef98350e4c814 (patch) | |
| tree | f6f0489294e04eb78d54be9bb75feb3d9b16b1a0 | |
| parent | e7e21cba127875de0357079ef44bd14a081b2964 (diff) | |
| download | glibc-7f786dc12bd60f0a134e538429fef98350e4c814.tar.gz glibc-7f786dc12bd60f0a134e538429fef98350e4c814.tar.xz glibc-7f786dc12bd60f0a134e538429fef98350e4c814.zip | |
Fix nptl/tst-mutex5.c: Do not skip tests if elision is enabled.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | nptl/tst-mutex5.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 50afebc3c4..07aca34dd0 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 a829272741..6988840987 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) { |