Merge branch 'remove-stub-tests-41012'

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41012
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>

7 files changed, 0 insertions, 60 deletions

diff --git a/bus/policy.c b/bus/policy.c
index 4841f47c..34e84469 100644
--- a/bus/policy.c
+++ b/bus/policy.c
@@ -1280,18 +1280,3 @@ bus_client_policy_check_can_own (BusClientPolicy  *policy,
 
   return allowed;
 }
-
-#ifdef DBUS_BUILD_TESTS
-
-dbus_bool_t
-bus_policy_test (const DBusString *test_data_dir)
-{
-  /* This doesn't do anything for now because I decided to do it in
-   * dispatch.c instead by having some of the clients in dispatch.c
-   * have particular policies applied to them.
-   */
-  
-  return TRUE;
-}
-
-#endif /* DBUS_BUILD_TESTS */
diff --git a/bus/test-main.c b/bus/test-main.c
index a8039d51..1b7c5bea 100644
--- a/bus/test-main.c
+++ b/bus/test-main.c
@@ -130,15 +130,6 @@ main (int argc, char **argv)
       test_post_hook ();
     }
 
-  if (only == NULL || strcmp (only, "policy") == 0)
-    {
-      test_pre_hook ();
-      printf ("%s: Running policy test\n", argv[0]);
-      if (!bus_policy_test (&test_data_dir))
-        die ("policy");
-      test_post_hook ();
-    }
-
   if (only == NULL || strcmp (only, "signals") == 0)
     {
       test_pre_hook ();
diff --git a/bus/test.h b/bus/test.h
index 45024e65..98a2c6ba 100644
--- a/bus/test.h
+++ b/bus/test.h
@@ -32,7 +32,6 @@
 
 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_policy_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);
diff --git a/dbus/dbus-marshal-header.c b/dbus/dbus-marshal-header.c
index 28984f4c..4a763fba 100644
--- a/dbus/dbus-marshal-header.c
+++ b/dbus/dbus-marshal-header.c
@@ -1497,16 +1497,3 @@ _dbus_header_byteswap (DBusHeader *header,
 }
 
 /** @} */
-
-#ifdef DBUS_BUILD_TESTS
-#include "dbus-test.h"
-#include <stdio.h>
-
-dbus_bool_t
-_dbus_marshal_header_test (void)
-{
-
-  return TRUE;
-}
-
-#endif /* DBUS_BUILD_TESTS */
diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c
index f9613195..e7f5cd98 100644
--- a/dbus/dbus-pending-call.c
+++ b/dbus/dbus-pending-call.c
@@ -808,19 +808,3 @@ dbus_pending_call_get_data (DBusPendingCall   *pending,
 }
 
 /** @} */
-
-#ifdef DBUS_BUILD_TESTS
-
-/**
- * @ingroup DBusPendingCallInternals
- * Unit test for DBusPendingCall.
- *
- * @returns #TRUE on success.
- */
-dbus_bool_t
-_dbus_pending_call_test (const char *test_data_dir)
-{  
-
-  return TRUE;
-}
-#endif /* DBUS_BUILD_TESTS */
diff --git a/dbus/dbus-test.c b/dbus/dbus-test.c
index 1fbaf8c8..b2eeb724 100644
--- a/dbus/dbus-test.c
+++ b/dbus/dbus-test.c
@@ -150,8 +150,6 @@ dbus_internal_do_not_use_run_tests (const char *test_data_dir, const char *speci
 
   run_test ("marshal-validate", specific_test, _dbus_marshal_validate_test);
 
-  run_test ("marshal-header", specific_test, _dbus_marshal_header_test);
-  
   run_data_test ("message", specific_test, _dbus_message_test, test_data_dir);
   
   run_test ("hash", specific_test, _dbus_hash_test);
@@ -172,8 +170,6 @@ dbus_internal_do_not_use_run_tests (const char *test_data_dir, const char *speci
   
   run_data_test ("auth", specific_test, _dbus_auth_test, test_data_dir);
 
-  run_data_test ("pending-call", specific_test, _dbus_pending_call_test, test_data_dir);
-  
   printf ("%s: completed successfully\n", "dbus-test");
 #else
   printf ("Not compiled with unit tests, not running any\n");
diff --git a/dbus/dbus-test.h b/dbus/dbus-test.h
index 982577fb..d97d142a 100644
--- a/dbus/dbus-test.h
+++ b/dbus/dbus-test.h
@@ -33,7 +33,6 @@ dbus_bool_t _dbus_list_test              (void);
 dbus_bool_t _dbus_marshal_test           (void);
 dbus_bool_t _dbus_marshal_recursive_test (void);
 dbus_bool_t _dbus_marshal_byteswap_test  (void);
-dbus_bool_t _dbus_marshal_header_test    (void);
 dbus_bool_t _dbus_marshal_validate_test  (void);
 dbus_bool_t _dbus_misc_test              (void);
 dbus_bool_t _dbus_signature_test         (void);
@@ -51,7 +50,6 @@ dbus_bool_t _dbus_spawn_test             (const char *test_data_dir);
 dbus_bool_t _dbus_userdb_test            (const char *test_data_dir);
 dbus_bool_t _dbus_memory_test            (void);
 dbus_bool_t _dbus_object_tree_test       (void);
-dbus_bool_t _dbus_pending_call_test      (const char *test_data_dir);
 dbus_bool_t _dbus_credentials_test       (const char *test_data_dir);
 
 void        dbus_internal_do_not_use_run_tests         (const char          *test_data_dir,