embedded tests: Conform to the same API for all tests

This will make it possible to unify the wrapper code that runs them.

I'm using a plain C string rather than a DBusString to make it
more straightforward to carve out tests into their own executables.

Signed-off-by: Simon McVittie <smcv@collabora.com>

30 files changed, 143 insertions, 150 deletions

diff --git a/bus/activation.c b/bus/activation.c
index 2c5d710f..05dbfce4 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -2733,12 +2733,15 @@ do_service_reload_test (const DBusString *test_data_dir,
 }
 
 dbus_bool_t
-bus_activation_service_reload_test (const DBusString *test_data_dir)
+bus_activation_service_reload_test (const char *test_data_dir_cstr)
 {
+  DBusString test_data_dir;
   DBusString directory;
   const char *tmp;
   dbus_bool_t ret = FALSE;
 
+  _dbus_string_init_const (&test_data_dir, test_data_dir_cstr);
+
   if (!_dbus_string_init (&directory))
     return FALSE;
 
@@ -2758,7 +2761,7 @@ bus_activation_service_reload_test (const DBusString *test_data_dir)
   if (!init_service_reload_test (&directory))
     _dbus_test_fatal ("could not initiate service reload test");
 
-  if (!do_service_reload_test (test_data_dir, &directory, FALSE))
+  if (!do_service_reload_test (&test_data_dir, &directory, FALSE))
     {
       /* Do nothing? */
     }
@@ -2770,7 +2773,7 @@ bus_activation_service_reload_test (const DBusString *test_data_dir)
   if (!init_service_reload_test (&directory))
     _dbus_test_fatal ("could not initiate service reload test");
 
-  if (!do_service_reload_test (test_data_dir, &directory, TRUE))
+  if (!do_service_reload_test (&test_data_dir, &directory, TRUE))
     {
       /* Do nothing? */
     }
diff --git a/bus/config-parser-trivial.c b/bus/config-parser-trivial.c
index e230faa2..fd7bbf00 100644
--- a/bus/config-parser-trivial.c
+++ b/bus/config-parser-trivial.c
@@ -687,36 +687,41 @@ check_file_valid (DBusString *full_path,
 }
 
 dbus_bool_t
-bus_config_parser_trivial_test (const DBusString *test_data_dir)
+bus_config_parser_trivial_test (const char *test_data_dir_cstr)
 {
+  DBusString test_data_dir;
   DBusString full_path;
   dbus_bool_t retval;
 
   retval = FALSE;
 
-  if (test_data_dir == NULL ||
-      _dbus_string_get_length (test_data_dir) == 0)
+  if (test_data_dir_cstr == NULL || test_data_dir_cstr[0] == '\0')
     {
       _dbus_test_diag ("No test data");
       return TRUE;
     }
-  
+
+  _dbus_string_init_const (&test_data_dir, test_data_dir_cstr);
+
   /* We already test default_session_servicedirs and default_system_servicedirs
    * in bus_config_parser_test() */
-  if (!process_test_valid_subdir (test_data_dir, "valid-config-files", VALID))
+  if (!process_test_valid_subdir (&test_data_dir, "valid-config-files",
+                                  VALID))
     goto finish;
 
 #ifndef DBUS_WIN
   /* We already test default_session_servicedirs and default_system_servicedirs
    * in bus_config_parser_test() */
-  if (!process_test_valid_subdir (test_data_dir, "valid-config-files-system", VALID))
+  if (!process_test_valid_subdir (&test_data_dir,
+                                  "valid-config-files-system", VALID))
     goto finish;
 #endif
 
   /* we don't process all the invalid files, as the trivial parser can't hope
    * to validate them all for all different syntaxes. We just check one broken
    * file to see if junk is received */
-  if (!make_full_path (test_data_dir, "invalid-config-files", "not-well-formed.conf", &full_path))
+  if (!make_full_path (&test_data_dir, "invalid-config-files",
+                       "not-well-formed.conf", &full_path))
     goto finish;
   if (!check_file_valid (&full_path, INVALID))
     goto finish;
@@ -724,7 +729,8 @@ bus_config_parser_trivial_test (const DBusString *test_data_dir)
 
 #ifndef DBUS_WIN
   /* just test if the check_file_valid works okay and we got sane values */
-  if (!make_full_path (test_data_dir, "valid-config-files-system", "system.conf", &full_path))
+  if (!make_full_path (&test_data_dir, "valid-config-files-system",
+                       "system.conf", &full_path))
     goto finish;
   if (!check_file_valid (&full_path, VALID))
     goto finish;
diff --git a/bus/config-parser.c b/bus/config-parser.c
index b9f6d907..4e62c342 100644
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -3990,16 +3990,19 @@ test_default_system_servicedirs (void)
 #endif
 		   
 dbus_bool_t
-bus_config_parser_test (const DBusString *test_data_dir)
+bus_config_parser_test (const char *test_data_dir_cstr)
 {
-  if (test_data_dir == NULL ||
-      _dbus_string_get_length (test_data_dir) == 0)
+  DBusString test_data_dir;
+
+  if (test_data_dir_cstr == NULL || test_data_dir_cstr[0] == '\0')
     {
       _dbus_test_diag ("No test data");
       return TRUE;
     }
 
-  if (!test_default_session_servicedirs (test_data_dir))
+  _dbus_string_init_const (&test_data_dir, test_data_dir_cstr);
+
+  if (!test_default_session_servicedirs (&test_data_dir))
     return FALSE;
 
 #ifdef DBUS_WIN
@@ -4009,18 +4012,21 @@ bus_config_parser_test (const DBusString *test_data_dir)
     return FALSE;
 #endif
 
-  if (!process_test_valid_subdir (test_data_dir, "valid-config-files", VALID))
+  if (!process_test_valid_subdir (&test_data_dir, "valid-config-files",
+                                  VALID))
     return FALSE;
 
 #ifndef DBUS_WIN
-  if (!process_test_valid_subdir (test_data_dir, "valid-config-files-system", VALID))
+  if (!process_test_valid_subdir (&test_data_dir,
+                                  "valid-config-files-system", VALID))
     return FALSE;
 #endif
 
-  if (!process_test_valid_subdir (test_data_dir, "invalid-config-files", INVALID))
+  if (!process_test_valid_subdir (&test_data_dir, "invalid-config-files",
+                                  INVALID))
     return FALSE;
 
-  if (!process_test_equiv_subdir (test_data_dir, "equiv-config-files"))
+  if (!process_test_equiv_subdir (&test_data_dir, "equiv-config-files"))
     return FALSE;
 
   return TRUE;
diff --git a/bus/dispatch.c b/bus/dispatch.c
index 4ac93fea..b17d0ad2 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -5023,23 +5023,27 @@ bus_dispatch_test_conf_fail (const DBusString *test_data_dir,
 #endif
 
 dbus_bool_t
-bus_dispatch_test (const DBusString *test_data_dir)
+bus_dispatch_test (const char *test_data_dir_cstr)
 {
+  DBusString test_data_dir;
+
+  _dbus_string_init_const (&test_data_dir, test_data_dir_cstr);
+
   /* run normal activation tests */
   _dbus_verbose ("Normal activation tests\n");
-  if (!bus_dispatch_test_conf (test_data_dir,
+  if (!bus_dispatch_test_conf (&test_data_dir,
   			       "valid-config-files/debug-allow-all.conf", FALSE))
     return FALSE;
 
 #ifndef DBUS_WIN
   /* run launch-helper activation tests */
   _dbus_verbose ("Launch helper activation tests\n");
-  if (!bus_dispatch_test_conf (test_data_dir,
+  if (!bus_dispatch_test_conf (&test_data_dir,
   			       "valid-config-files-system/debug-allow-all-pass.conf", TRUE))
     return FALSE;
 
   /* run select launch-helper activation tests on broken service files */
-  if (!bus_dispatch_test_conf_fail (test_data_dir,
+  if (!bus_dispatch_test_conf_fail (&test_data_dir,
   			            "valid-config-files-system/debug-allow-all-fail.conf"))
     return FALSE;
 #endif
@@ -5048,18 +5052,20 @@ bus_dispatch_test (const DBusString *test_data_dir)
 }
 
 dbus_bool_t
-bus_dispatch_sha1_test (const DBusString *test_data_dir)
+bus_dispatch_sha1_test (const char *test_data_dir_cstr)
 {
+  DBusString test_data_dir;
   BusContext *context;
   DBusConnection *foo;
   DBusError error;
 
+  _dbus_string_init_const (&test_data_dir, test_data_dir_cstr);
   dbus_error_init (&error);
 
   /* Test SHA1 authentication */
   _dbus_verbose ("Testing SHA1 context\n");
 
-  context = bus_context_new_test (test_data_dir,
+  context = bus_context_new_test (&test_data_dir,
                                   "valid-config-files/debug-allow-all-sha1.conf");
   if (context == NULL)
     return FALSE;
@@ -5095,8 +5101,9 @@ bus_dispatch_sha1_test (const DBusString *test_data_dir)
 #ifdef HAVE_UNIX_FD_PASSING
 
 dbus_bool_t
-bus_unix_fds_passing_test(const DBusString *test_data_dir)
+bus_unix_fds_passing_test (const char *test_data_dir_cstr)
 {
+  DBusString test_data_dir;
   BusContext *context;
   DBusConnection *foo, *bar;
   DBusError error;
@@ -5105,9 +5112,11 @@ bus_unix_fds_passing_test(const DBusString *test_data_dir)
   int x, y, z;
   char r;
 
+  _dbus_string_init_const (&test_data_dir, test_data_dir_cstr);
   dbus_error_init (&error);
 
-  context = bus_context_new_test (test_data_dir, "valid-config-files/debug-allow-all.conf");
+  context = bus_context_new_test (&test_data_dir,
+                                  "valid-config-files/debug-allow-all.conf");
   if (context == NULL)
     _dbus_test_fatal ("could not alloc context");
 
diff --git a/bus/expirelist.c b/bus/expirelist.c
index e3bea5c0..77dbf718 100644
--- a/bus/expirelist.c
+++ b/bus/expirelist.c
@@ -317,7 +317,7 @@ time_add_milliseconds (long *tv_sec,
 }
 
 dbus_bool_t
-bus_expire_list_test (const DBusString *test_data_dir)
+bus_expire_list_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   DBusLoop *loop;
   BusExpireList *list;
diff --git a/bus/signals.c b/bus/signals.c
index c9a8f453..c1224e7e 100644
--- a/bus/signals.c
+++ b/bus/signals.c
@@ -2963,7 +2963,7 @@ test_matching_path_namespace (void)
 }
 
 dbus_bool_t
-bus_signals_test (const DBusString *test_data_dir)
+bus_signals_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   BusMatchmaker *matchmaker;
 
diff --git a/bus/test-main.c b/bus/test-main.c
index 3bd780b5..ac014489 100644
--- a/bus/test-main.c
+++ b/bus/test-main.c
@@ -42,7 +42,6 @@
 
 static const char *only;
 static DBusInitialFDs *initial_fds = NULL;
-static DBusString test_data_dir;
 
 static void
 test_pre_hook (void)
@@ -63,7 +62,8 @@ test_post_hook (const char *name)
 
 static void
 test_one (const char *name,
-          dbus_bool_t (*func) (const DBusString *))
+          dbus_bool_t (*func) (const char *),
+          const char *test_data_dir)
 {
   if (only != NULL && strcmp (only, name) != 0)
     {
@@ -75,7 +75,7 @@ test_one (const char *name,
 
   test_pre_hook ();
 
-  if (func (&test_data_dir))
+  if (func (test_data_dir))
     _dbus_test_ok ("%s", name);
   else
     _dbus_test_not_ok ("%s", name);
@@ -101,22 +101,21 @@ main (int argc, char **argv)
   if (dir == NULL)
     _dbus_test_fatal ("Must specify test data directory as argv[1] or in DBUS_TEST_DATA env variable");
 
-  _dbus_string_init_const (&test_data_dir, dir);
-
 #ifdef DBUS_UNIX
   /* close any inherited fds so dbus-spawn's check for close-on-exec works */
   _dbus_close_all ();
 #endif
 
-  test_one ("expire-list", bus_expire_list_test);
-  test_one ("config-parser", bus_config_parser_test);
-  test_one ("signals", bus_signals_test);
-  test_one ("dispatch-sha1", bus_dispatch_sha1_test);
-  test_one ("dispatch", bus_dispatch_test);
-  test_one ("activation-service-reload", bus_activation_service_reload_test);
+  test_one ("expire-list", bus_expire_list_test, dir);
+  test_one ("config-parser", bus_config_parser_test, dir);
+  test_one ("signals", bus_signals_test, dir);
+  test_one ("dispatch-sha1", bus_dispatch_sha1_test, dir);
+  test_one ("dispatch", bus_dispatch_test, dir);
+  test_one ("activation-service-reload",
+            bus_activation_service_reload_test, dir);
 
 #ifdef HAVE_UNIX_FD_PASSING
-  test_one ("unix-fds-passing", bus_unix_fds_passing_test);
+  test_one ("unix-fds-passing", bus_unix_fds_passing_test, dir);
 #else
   _dbus_test_skip ("fd-passing not supported on this platform");
 #endif
diff --git a/bus/test-system.c b/bus/test-system.c
index 8be9134f..25e3b663 100644
--- a/bus/test-system.c
+++ b/bus/test-system.c
@@ -50,7 +50,6 @@ int
 main (int argc, char **argv)
 {
   const char *dir;
-  DBusString test_data_dir;
 
   progname = argv[0];
 
@@ -62,11 +61,9 @@ main (int argc, char **argv)
   if (dir == NULL)
     _dbus_test_fatal ("Must specify test data directory as argv[1] or in DBUS_TEST_DATA env variable");
 
-  _dbus_string_init_const (&test_data_dir, dir);
-
   test_pre_hook ();
   _dbus_test_diag ("%s: Running config file parser (trivial) test", argv[0]);
-  if (!bus_config_parser_trivial_test (&test_data_dir))
+  if (!bus_config_parser_trivial_test (dir))
     _dbus_test_fatal ("OOM creating parser");
 
   /* All failure modes for this test are currently fatal */
diff --git a/bus/test.h b/bus/test.h
index 07625cf5..61367542 100644
--- a/bus/test.h
+++ b/bus/test.h
@@ -33,13 +33,13 @@
 typedef dbus_bool_t (* BusConnectionForeachFunction) (DBusConnection *connection,
                                                       void           *data);
 
-dbus_bool_t bus_dispatch_test         (const DBusString             *test_data_dir);
-dbus_bool_t bus_dispatch_sha1_test    (const DBusString             *test_data_dir);
-dbus_bool_t bus_config_parser_test    (const DBusString             *test_data_dir);
-dbus_bool_t bus_config_parser_trivial_test (const DBusString        *test_data_dir);
-dbus_bool_t bus_signals_test          (const DBusString             *test_data_dir);
-dbus_bool_t bus_expire_list_test      (const DBusString             *test_data_dir);
-dbus_bool_t bus_activation_service_reload_test (const DBusString    *test_data_dir);
+dbus_bool_t bus_dispatch_test         (const char                   *test_data_dir_cstr);
+dbus_bool_t bus_dispatch_sha1_test    (const char                   *test_data_dir_cstr);
+dbus_bool_t bus_config_parser_test    (const char                   *test_data_dir_cstr);
+dbus_bool_t bus_config_parser_trivial_test (const char              *test_data_dir_cstr);
+dbus_bool_t bus_signals_test          (const char                   *test_data_dir);
+dbus_bool_t bus_expire_list_test      (const char                   *test_data_dir);
+dbus_bool_t bus_activation_service_reload_test (const char          *test_data_dir_cstr);
 dbus_bool_t bus_setup_debug_client    (DBusConnection               *connection);
 void        bus_test_clients_foreach  (BusConnectionForeachFunction  function,
                                        void                         *data);
@@ -52,7 +52,7 @@ BusContext* bus_context_new_test      (const DBusString             *test_data_d
                                        const char                   *filename);
 
 #ifdef HAVE_UNIX_FD_PASSING
-dbus_bool_t bus_unix_fds_passing_test (const DBusString             *test_data_dir);
+dbus_bool_t bus_unix_fds_passing_test (const char                   *test_data_dir_cstr);
 #endif
 
 #endif
diff --git a/dbus/dbus-address.c b/dbus/dbus-address.c
index 51f748f0..7eb1b1bf 100644
--- a/dbus/dbus-address.c
+++ b/dbus/dbus-address.c
@@ -698,7 +698,7 @@ static const char* invalid_escaped_values[] = {
 };
 
 dbus_bool_t
-_dbus_address_test (void)
+_dbus_address_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   DBusAddressEntry **entries;
   int len;
diff --git a/dbus/dbus-dataslot.c b/dbus/dbus-dataslot.c
index ebff27d3..18e20f60 100644
--- a/dbus/dbus-dataslot.c
+++ b/dbus/dbus-dataslot.c
@@ -368,7 +368,7 @@ test_free_slot_data_func (void *data)
  * Test function for data slots
  */
 dbus_bool_t
-_dbus_data_slot_test (void)
+_dbus_data_slot_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   DBusDataSlotAllocator allocator;
   DBusDataSlotList list;
diff --git a/dbus/dbus-hash.c b/dbus/dbus-hash.c
index d3d2e978..12b803f7 100644
--- a/dbus/dbus-hash.c
+++ b/dbus/dbus-hash.c
@@ -1631,7 +1631,7 @@ steal (void *ptr)
  * @returns #TRUE on success.
  */
 dbus_bool_t
-_dbus_hash_test (void)
+_dbus_hash_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   int i;
   DBusHashTable *table1;
diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
index 886a02f6..d2df3d86 100644
--- a/dbus/dbus-keyring.c
+++ b/dbus/dbus-keyring.c
@@ -1023,7 +1023,7 @@ _dbus_keyring_get_hex_key (DBusKeyring       *keyring,
 #include <stdio.h>
 
 dbus_bool_t
-_dbus_keyring_test (void)
+_dbus_keyring_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   DBusString context;
   DBusKeyring *ring1;
diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c
index 3824b24a..1bf1e7a9 100644
--- a/dbus/dbus-list.c
+++ b/dbus/dbus-list.c
@@ -972,7 +972,7 @@ lists_equal (DBusList **list1,
  * @returns #TRUE on success.
  */
 dbus_bool_t
-_dbus_list_test (void)
+_dbus_list_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   DBusList *list1;
   DBusList *list2;
diff --git a/dbus/dbus-marshal-basic.c b/dbus/dbus-marshal-basic.c
index ba9a935c..ab080d0e 100644
--- a/dbus/dbus-marshal-basic.c
+++ b/dbus/dbus-marshal-basic.c
@@ -1663,7 +1663,7 @@ swap_test_array (void *array,
   } while (0)
 
 dbus_bool_t
-_dbus_marshal_test (void)
+_dbus_marshal_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   int alignment;
   DBusString str;
diff --git a/dbus/dbus-marshal-byteswap-util.c b/dbus/dbus-marshal-byteswap-util.c
index 4891e0de..66f65c24 100644
--- a/dbus/dbus-marshal-byteswap-util.c
+++ b/dbus/dbus-marshal-byteswap-util.c
@@ -92,7 +92,7 @@ do_byteswap_test (int byte_order)
 }
 
 dbus_bool_t
-_dbus_marshal_byteswap_test (void)
+_dbus_marshal_byteswap_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   do_byteswap_test (DBUS_LITTLE_ENDIAN);
   do_byteswap_test (DBUS_BIG_ENDIAN);
diff --git a/dbus/dbus-marshal-recursive-util.c b/dbus/dbus-marshal-recursive-util.c
index f53e3827..edeebc43 100644
--- a/dbus/dbus-marshal-recursive-util.c
+++ b/dbus/dbus-marshal-recursive-util.c
@@ -2041,7 +2041,7 @@ out:
 }
 
 dbus_bool_t
-_dbus_marshal_recursive_test (void)
+_dbus_marshal_recursive_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   make_and_run_test_nodes ();
 
diff --git a/dbus/dbus-marshal-validate-util.c b/dbus/dbus-marshal-validate-util.c
index 2ef13a63..e62c1120 100644
--- a/dbus/dbus-marshal-validate-util.c
+++ b/dbus/dbus-marshal-validate-util.c
@@ -106,7 +106,7 @@ static const ValidityTest signature_tests[] = {
 };
 
 dbus_bool_t
-_dbus_marshal_validate_test (void)
+_dbus_marshal_validate_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   DBusString str;
   int i;
diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c
index ada797bc..98869d57 100644
--- a/dbus/dbus-memory.c
+++ b/dbus/dbus-memory.c
@@ -930,7 +930,7 @@ dbus_shutdown (void)
  * @returns #TRUE on success.
  */
 dbus_bool_t
-_dbus_memory_test (void)
+_dbus_memory_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   dbus_bool_t old_guards;
   void *p;
diff --git a/dbus/dbus-mempool.c b/dbus/dbus-mempool.c
index 0b3efb42..638799e1 100644
--- a/dbus/dbus-mempool.c
+++ b/dbus/dbus-mempool.c
@@ -629,7 +629,7 @@ time_for_size (int size)
  * @returns #TRUE on success.
  */
 dbus_bool_t
-_dbus_mem_pool_test (void)
+_dbus_mem_pool_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   int i;
   int element_sizes[] = { 4, 8, 16, 50, 124 };
diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c
index 56f6e2c2..f62b1f28 100644
--- a/dbus/dbus-message-util.c
+++ b/dbus/dbus-message-util.c
@@ -1187,7 +1187,7 @@ verify_test_message_memleak (DBusMessage *message)
  * @returns #TRUE on success.
  */
 dbus_bool_t
-_dbus_message_test (const char *test_data_dir)
+_dbus_message_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   DBusMessage *message, *message_without_unix_fds;
   DBusMessageLoader *loader;
diff --git a/dbus/dbus-misc.c b/dbus/dbus-misc.c
index 198557f0..fefe05a4 100644
--- a/dbus/dbus-misc.c
+++ b/dbus/dbus-misc.c
@@ -232,7 +232,7 @@ dbus_get_version (int *major_version_p,
 
 
 dbus_bool_t
-_dbus_misc_test (void)
+_dbus_misc_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   int major, minor, micro;
   DBusString str;
diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c
index 498d6158..6038a63c 100644
--- a/dbus/dbus-object-tree.c
+++ b/dbus/dbus-object-tree.c
@@ -2319,7 +2319,7 @@ object_tree_test_iteration (void        *data,
  * @returns #TRUE on success.
  */
 dbus_bool_t
-_dbus_object_tree_test (void)
+_dbus_object_tree_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   return _dbus_test_oom_handling ("object tree",
                                   object_tree_test_iteration,
diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c
index 034e8a45..b5153cee 100644
--- a/dbus/dbus-server.c
+++ b/dbus/dbus-server.c
@@ -1199,7 +1199,7 @@ dbus_server_get_data (DBusServer   *server,
 #include <string.h>
 
 dbus_bool_t
-_dbus_server_test (void)
+_dbus_server_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   const char *valid_addresses[] = {
     "tcp:port=1234",
diff --git a/dbus/dbus-signature.c b/dbus/dbus-signature.c
index 94a25d5e..2df893c8 100644
--- a/dbus/dbus-signature.c
+++ b/dbus/dbus-signature.c
@@ -421,7 +421,7 @@ dbus_type_is_valid (int typecode)
  * @returns #TRUE on success.
  */
 dbus_bool_t
-_dbus_signature_test (void)
+_dbus_signature_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   DBusSignatureIter iter;
   DBusSignatureIter subiter;
diff --git a/dbus/dbus-string-util.c b/dbus/dbus-string-util.c
index 355ca9c7..8e304281 100644
--- a/dbus/dbus-string-util.c
+++ b/dbus/dbus-string-util.c
@@ -226,7 +226,7 @@ _DBUS_STRING_DEFINE_STATIC (test_static_string, "hello");
  * @returns #TRUE on success.
  */
 dbus_bool_t
-_dbus_string_test (void)
+_dbus_string_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   DBusString str = _DBUS_STRING_INIT_INVALID;
   DBusString other;
diff --git a/dbus/dbus-sysdeps-util.c b/dbus/dbus-sysdeps-util.c
index 5881ba46..4a7d08cc 100644
--- a/dbus/dbus-sysdeps-util.c
+++ b/dbus/dbus-sysdeps-util.c
@@ -132,7 +132,7 @@ check_path_absolute (const char *path,
  * @returns #TRUE on success.
  */
 dbus_bool_t
-_dbus_sysdeps_test (void)
+_dbus_sysdeps_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
 #ifdef DBUS_WIN
   check_dirname ("foo\\bar", "foo");
diff --git a/dbus/dbus-test.c b/dbus/dbus-test.c
index 6342a41c..7045576d 100644
--- a/dbus/dbus-test.c
+++ b/dbus/dbus-test.c
@@ -30,31 +30,9 @@
 #include <stdlib.h>
 
 #ifdef DBUS_ENABLE_EMBEDDED_TESTS
-typedef dbus_bool_t (*TestFunc)(void);
 typedef dbus_bool_t (*TestDataFunc)(const char *data);
 
 static void
-run_test (const char             *test_name,
-          const char             *specific_test,
-          TestFunc                test)
-{
-  if (specific_test != NULL && strcmp (specific_test, test_name) != 0)
-    {
-      _dbus_test_skip ("%s - Only intending to run %s", test_name, specific_test);
-      return;
-    }
-
-  _dbus_test_diag ("%s: running %s tests", "test-dbus", test_name);
-
-  if (test ())
-    _dbus_test_ok ("%s", test_name);
-  else
-    _dbus_test_not_ok ("%s", test_name);
-
-  _dbus_test_check_memleaks (test_name);
-}
-
-static void
 run_data_test (const char             *test_name,
                const char             *specific_test,
                TestDataFunc            test,
@@ -98,41 +76,36 @@ _dbus_run_tests (const char   *test_data_dir,
   else
     _dbus_test_diag ("No test data!");
 
-  run_test ("string", specific_test, _dbus_string_test);
-  
-  run_test ("sysdeps", specific_test, _dbus_sysdeps_test);
-  
-  run_test ("data-slot", specific_test, _dbus_data_slot_test);
-
-  run_test ("misc", specific_test, _dbus_misc_test);
-  
-  run_test ("address", specific_test, _dbus_address_test);
-
-  run_test ("server", specific_test, _dbus_server_test);
-
-  run_test ("object-tree", specific_test, _dbus_object_tree_test);
-
-  run_test ("signature", specific_test, _dbus_signature_test);
-  
-  run_test ("marshalling", specific_test, _dbus_marshal_test);
-
-  run_test ("marshal-recursive", specific_test, _dbus_marshal_recursive_test);
-
-  run_test ("byteswap", specific_test, _dbus_marshal_byteswap_test);
-  
-  run_test ("memory", specific_test, _dbus_memory_test);
-
-#if 1
-  run_test ("mem-pool", specific_test, _dbus_mem_pool_test);
-#endif
-  
-  run_test ("list", specific_test, _dbus_list_test);
-
-  run_test ("marshal-validate", specific_test, _dbus_marshal_validate_test);
-
+  run_data_test ("string", specific_test, _dbus_string_test,
+                 test_data_dir);
+  run_data_test ("sysdeps", specific_test, _dbus_sysdeps_test,
+                 test_data_dir);
+  run_data_test ("data-slot", specific_test, _dbus_data_slot_test,
+                 test_data_dir);
+  run_data_test ("misc", specific_test, _dbus_misc_test, test_data_dir);
+  run_data_test ("address", specific_test, _dbus_address_test,
+                 test_data_dir);
+  run_data_test ("server", specific_test, _dbus_server_test,
+                 test_data_dir);
+  run_data_test ("object-tree", specific_test, _dbus_object_tree_test,
+                 test_data_dir);
+  run_data_test ("signature", specific_test, _dbus_signature_test,
+                 test_data_dir);
+  run_data_test ("marshalling", specific_test, _dbus_marshal_test,
+                 test_data_dir);
+  run_data_test ("marshal-recursive", specific_test,
+                 _dbus_marshal_recursive_test, test_data_dir);
+  run_data_test ("byteswap", specific_test, _dbus_marshal_byteswap_test,
+                 test_data_dir);
+  run_data_test ("memory", specific_test, _dbus_memory_test,
+                 test_data_dir);
+  run_data_test ("mem-pool", specific_test, _dbus_mem_pool_test,
+                 test_data_dir);
+  run_data_test ("list", specific_test, _dbus_list_test, test_data_dir);
+  run_data_test ("marshal-validate", specific_test,
+                 _dbus_marshal_validate_test, test_data_dir);
   run_data_test ("message", specific_test, _dbus_message_test, test_data_dir);
-  
-  run_test ("hash", specific_test, _dbus_hash_test);
+  run_data_test ("hash", specific_test, _dbus_hash_test, test_data_dir);
 
 #if !defined(DBUS_WINCE)
   run_data_test ("spawn", specific_test, _dbus_spawn_test, test_data_dir);
@@ -143,13 +116,13 @@ _dbus_run_tests (const char   *test_data_dir,
 #ifdef DBUS_UNIX
   run_data_test ("userdb", specific_test, _dbus_userdb_test, test_data_dir);
 
-  run_test ("transport-unix", specific_test, _dbus_transport_unix_test);
+  run_data_test ("transport-unix", specific_test,
+                 _dbus_transport_unix_test, test_data_dir);
 #endif
   
-  run_test ("keyring", specific_test, _dbus_keyring_test);
-
+  run_data_test ("keyring", specific_test, _dbus_keyring_test,
+                 test_data_dir);
   run_data_test ("sha", specific_test, _dbus_sha_test, test_data_dir);
-  
   run_data_test ("auth", specific_test, _dbus_auth_test, test_data_dir);
 }
 
diff --git a/dbus/dbus-test.h b/dbus/dbus-test.h
index d0091605..e12e11bf 100644
--- a/dbus/dbus-test.h
+++ b/dbus/dbus-test.h
@@ -38,34 +38,34 @@
  */
 
 DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_hash_test              (void);
+dbus_bool_t _dbus_hash_test              (const char *test_data_dir);
 
 DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_list_test              (void);
+dbus_bool_t _dbus_list_test              (const char *test_data_dir);
 
 DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_marshal_test           (void);
+dbus_bool_t _dbus_marshal_test           (const char *test_data_dir);
 
-dbus_bool_t _dbus_marshal_recursive_test (void);
-dbus_bool_t _dbus_marshal_byteswap_test  (void);
-dbus_bool_t _dbus_marshal_validate_test  (void);
+dbus_bool_t _dbus_marshal_recursive_test (const char *test_data_dir);
+dbus_bool_t _dbus_marshal_byteswap_test  (const char *test_data_dir);
+dbus_bool_t _dbus_marshal_validate_test  (const char *test_data_dir);
 
 DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_misc_test              (void);
+dbus_bool_t _dbus_misc_test              (const char *test_data_dir);
 
 DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_signature_test         (void);
+dbus_bool_t _dbus_signature_test         (const char *test_data_dir);
 
 DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_mem_pool_test          (void);
+dbus_bool_t _dbus_mem_pool_test          (const char *test_data_dir);
 
-dbus_bool_t _dbus_string_test            (void);
+dbus_bool_t _dbus_string_test            (const char *test_data_dir);
 
 DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_address_test           (void);
+dbus_bool_t _dbus_address_test           (const char *test_data_dir);
 
 DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_server_test            (void);
+dbus_bool_t _dbus_server_test            (const char *test_data_dir);
 
 dbus_bool_t _dbus_message_test           (const char *test_data_dir);
 dbus_bool_t _dbus_auth_test              (const char *test_data_dir);
@@ -74,25 +74,25 @@ DBUS_PRIVATE_EXPORT
 dbus_bool_t _dbus_sha_test               (const char *test_data_dir);
 
 DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_keyring_test           (void);
+dbus_bool_t _dbus_keyring_test           (const char *test_data_dir);
 
 DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_data_slot_test         (void);
+dbus_bool_t _dbus_data_slot_test         (const char *test_data_dir);
 
-dbus_bool_t _dbus_sysdeps_test           (void);
+dbus_bool_t _dbus_sysdeps_test           (const char *test_data_dir);
 dbus_bool_t _dbus_spawn_test             (const char *test_data_dir);
 
 DBUS_PRIVATE_EXPORT
 dbus_bool_t _dbus_userdb_test            (const char *test_data_dir);
 
 DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_transport_unix_test    (void);
+dbus_bool_t _dbus_transport_unix_test    (const char *test_data_dir);
 
 DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_memory_test            (void);
+dbus_bool_t _dbus_memory_test            (const char *test_data_dir);
 
 DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_object_tree_test       (void);
+dbus_bool_t _dbus_object_tree_test       (const char *test_data_dir);
 
 dbus_bool_t _dbus_credentials_test       (const char *test_data_dir);
 
diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c
index 48657fa2..1989c9bb 100644
--- a/dbus/dbus-transport-unix.c
+++ b/dbus/dbus-transport-unix.c
@@ -411,7 +411,7 @@ _dbus_transport_open_platform_specific (DBusAddressEntry  *entry,
 #ifdef DBUS_ENABLE_EMBEDDED_TESTS
 
 dbus_bool_t
-_dbus_transport_unix_test (void)
+_dbus_transport_unix_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 {
   DBusConnection *c;
   DBusError error;