summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-06-22 15:53:09 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-09-19 15:05:39 +0100
commitc0aff8f86a0b6061ed92260b9232c72b5b0ed90b (patch)
tree52e1078e9fcfb6b980754afcd6d5f2db64e44f6a
parent775f77c719de325a0cbf8fb1d56ebbb8f6a923d7 (diff)
downloaddbus-c0aff8f86a0b6061ed92260b9232c72b5b0ed90b.tar.gz
bus_policy_test: remove stub
-rw-r--r--bus/policy.c15
-rw-r--r--bus/test-main.c9
-rw-r--r--bus/test.h1
3 files changed, 0 insertions, 25 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);