From fc3248065813557c37e1f5ec3442b652d4b0d404 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 4 Oct 2011 00:44:58 -0400 Subject: [PATCH] Improve testcoverage in the rec-mutex test Test g_rec_mutex_trylock() in both locked and unlocked cases. --- glib/tests/rec-mutex.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glib/tests/rec-mutex.c b/glib/tests/rec-mutex.c index c8d5a35b3..5f3abcc41 100644 --- a/glib/tests/rec-mutex.c +++ b/glib/tests/rec-mutex.c @@ -77,13 +77,13 @@ acquire (gint nr) self = g_thread_self (); - if (owners[nr] != NULL && owners[nr] != self) + if (!g_rec_mutex_trylock (&locks[nr])) { if (g_test_verbose ()) g_print ("thread %p going to block on lock %d\n", self, nr); - } - g_rec_mutex_lock (&locks[nr]); + g_rec_mutex_lock (&locks[nr]); + } g_assert (owners[nr] == NULL); /* hopefully nobody else is here */ owners[nr] = self;