summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-05-08 16:58:08 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-10-29 14:12:38 +0000
commit2e4d069ac40e102eace93818351ef17a9967e3cd (patch)
tree503b183c0d25daaa542e8197845564cbd411c9b0
parentf541722f5ac0b2ee2d9eab6b9a77aa1f1c174817 (diff)
downloaddbus-2e4d069ac40e102eace93818351ef17a9967e3cd.tar.gz
Stop asserting that we're not using the dummy lock implementation
That implementation no longer exists, so neither 0xABCDEF nor 0xABCDEF2 has any special meaning any more. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54972 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Alban Crequy <alban.crequy@collabora.co.uk>
-rw-r--r--test/name-test/test-threads-init.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/test/name-test/test-threads-init.c b/test/name-test/test-threads-init.c
index 580ffe14..a517e2a2 100644
--- a/test/name-test/test-threads-init.c
+++ b/test/name-test/test-threads-init.c
@@ -149,16 +149,6 @@ main (int argc, char *argv[])
&dispatch_cond1,
&io_path_cond1);
- /* Since 1.7 it is no longer the case that mutex1 != mutex2, because
- * initializing global locks automatically initializes locks
- * in general. However, it is true that the mutex is not the dummy
- * implementation, which is what we really wanted to check here. */
- _dbus_assert (mutex1 != (DBusMutex *) 0xABCDEF);
- _dbus_assert (dispatch_mutex1 != (DBusMutex *) 0xABCDEF);
- _dbus_assert (dispatch_cond1 != (DBusCondVar *) 0xABCDEF2);
- _dbus_assert (io_path_mutex1 != (DBusMutex *) 0xABCDEF);
- _dbus_assert (io_path_cond1 != (DBusCondVar *) 0xABCDEF2);
-
_run_iteration (conn);
_dbus_connection_test_get_locks (conn, &mutex2,
&dispatch_mutex2,