From: Mukund Sivaraman <muks@isc.org>
Date: Fri, 26 Oct 2012 06:33:28 +0000 (+0530)
Subject: [master] Enable CondVarTest.destroyWhileWait where it's possible to run it
X-Git-Tag: trac2487_base~21^2~11^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5a98d2f3e44ebec0de30f4f0905b83ca3a5df75;p=thirdparty%2Fkea.git

[master] Enable CondVarTest.destroyWhileWait where it's possible to run it
---

diff --git a/src/lib/util/threads/tests/condvar_unittest.cc b/src/lib/util/threads/tests/condvar_unittest.cc
index 8b1fe5445e..1e04efa3ff 100644
--- a/src/lib/util/threads/tests/condvar_unittest.cc
+++ b/src/lib/util/threads/tests/condvar_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#include <config.h>
+
 #include <exceptions/exceptions.h>
 
 #include <util/threads/sync.h>
@@ -137,8 +139,8 @@ signalAndWait(CondVar* condvar, Mutex* mutex) {
     condvar->wait(*mutex);
 }
 
-// Temporarily disabled: Solaris seems to make this behavior "undefined"
-TEST_F(CondVarTest, DISABLED_destroyWhileWait) {
+#ifndef HAS_UNDEFINED_PTHREAD_BEHAVIOR
+TEST_F(CondVarTest, destroyWhileWait) {
     // We'll destroy a CondVar object while the thread is still waiting
     // on it.  This will trigger an assertion failure.
     EXPECT_DEATH_IF_SUPPORTED({
@@ -148,6 +150,7 @@ TEST_F(CondVarTest, DISABLED_destroyWhileWait) {
             cond.wait(mutex_);
         }, "");
 }
+#endif // !HAS_UNDEFINED_PTHREAD_BEHAVIOR
 
 #ifdef ENABLE_DEBUG