From 7f786dc12bd60f0a134e538429fef98350e4c814 Mon Sep 17 00:00:00 2001 From: Torvald Riegel Date: Mon, 15 Dec 2014 22:09:55 +0100 Subject: [PATCH] Fix nptl/tst-mutex5.c: Do not skip tests if elision is enabled. --- ChangeLog | 4 ++++ nptl/tst-mutex5.c | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50afebc..07aca34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-12-15 Torvald Riegel + + * nptl/tst-mutex5.c (do_test): Do not skip tests if elision is enabled. + 2014-12-15 Adhemerval Zanella * stdio-common/test-vfprintf.c: Include . 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) { -- 2.7.4