2003-06-04 Havoc Pennington <hp@pobox.com>

[platform/upstream/dbus.git] / dbus / dbus-test.c

diff --git a/dbus/dbus-test.c b/dbus/dbus-test.c
index b9cf64c..00eb22d 100644 (file)
--- a/dbus/dbus-test.c
+++ b/dbus/dbus-test.c
@@ -65,6 +65,9 @@ void
 dbus_internal_do_not_use_run_tests (const char *test_data_dir)
 {
 #ifdef DBUS_BUILD_TESTS
+  if (!_dbus_threads_init_debug ())
+    die ("debug threads init");
+  
   if (test_data_dir == NULL)
     test_data_dir = _dbus_getenv ("DBUS_TEST_DATA");
 
@@ -78,36 +81,16 @@ dbus_internal_do_not_use_run_tests (const char *test_data_dir)
     die ("strings");
 
   check_memleaks ();
-  
-  printf ("%s: running data slot tests\n", "dbus-test");
-  if (!_dbus_data_slot_test ())
-    die ("dataslot");
 
-  check_memleaks ();
-  
-  printf ("%s: running keyring tests\n", "dbus-test");
-  if (!_dbus_keyring_test ())
-    die ("keyring");
+  printf ("%s: running sysdeps tests\n", "dbus-test");
+  if (!_dbus_sysdeps_test ())
+    die ("sysdeps");
 
   check_memleaks ();
   
-#if 0
-  printf ("%s: running md5 tests\n", "dbus-test");
-  if (!_dbus_md5_test ())
-    die ("md5");
-
-  check_memleaks ();
-#endif
-  
-  printf ("%s: running SHA-1 tests\n", "dbus-test");
-  if (!_dbus_sha_test (test_data_dir))
-    die ("SHA-1");
-
-  check_memleaks ();
-  
-  printf ("%s: running auth tests\n", "dbus-test");
-  if (!_dbus_auth_test (test_data_dir))
-    die ("auth");
+  printf ("%s: running data slot tests\n", "dbus-test");
+  if (!_dbus_data_slot_test ())
+    die ("dataslot");
 
   check_memleaks ();
   
@@ -123,12 +106,6 @@ dbus_internal_do_not_use_run_tests (const char *test_data_dir)
 
   check_memleaks ();
   
-  printf ("%s: running message tests\n", "dbus-test");
-  if (!_dbus_message_test (test_data_dir))
-    die ("messages");
-
-  check_memleaks ();
-  
   printf ("%s: running memory pool tests\n", "dbus-test");
   if (!_dbus_mem_pool_test ())
     die ("memory pools");
@@ -141,15 +118,59 @@ dbus_internal_do_not_use_run_tests (const char *test_data_dir)
 
   check_memleaks ();
   
+  printf ("%s: running message tests\n", "dbus-test");
+  if (!_dbus_message_test (test_data_dir))
+    die ("messages");
+
+  check_memleaks ();
+
+  printf ("%s: running message handler tests\n", "dbus-test");
+  if (!_dbus_message_handler_test (test_data_dir))
+    die ("message handler");
+
+  check_memleaks ();
+  
   printf ("%s: running hash table tests\n", "dbus-test");
   if (!_dbus_hash_test ())
     die ("hash tables");
 
   check_memleaks ();
+
+  printf ("%s: running spawn tests\n", "dbus-test");
+  if (!_dbus_spawn_test (test_data_dir))
+    die ("spawn");
+
+  check_memleaks ();
   
-  printf ("%s: running dict tests\n", "dbus-test");
-  if (!_dbus_dict_test ())
-    die ("dicts");
+  printf ("%s: running user database tests\n", "dbus-test");
+  if (!_dbus_userdb_test (test_data_dir))
+    die ("user database");
+
+  check_memleaks ();
+  
+  printf ("%s: running keyring tests\n", "dbus-test");
+  if (!_dbus_keyring_test ())
+    die ("keyring");
+
+  check_memleaks ();
+  
+#if 0
+  printf ("%s: running md5 tests\n", "dbus-test");
+  if (!_dbus_md5_test ())
+    die ("md5");
+
+  check_memleaks ();
+#endif
+  
+  printf ("%s: running SHA-1 tests\n", "dbus-test");
+  if (!_dbus_sha_test (test_data_dir))
+    die ("SHA-1");
+
+  check_memleaks ();
+  
+  printf ("%s: running auth tests\n", "dbus-test");
+  if (!_dbus_auth_test (test_data_dir))
+    die ("auth");
 
   check_memleaks ();