Stop asserting that we're not using the dummy lock implementation
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 8 May 2013 15:58:08 +0000 (16:58 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 29 Oct 2014 14:12:38 +0000 (14:12 +0000)
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>
test/name-test/test-threads-init.c

index 580ffe1..a517e2a 100644 (file)
@@ -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,