Attachment 51356 Details for Bug 41012 – [1/3] bus_policy_test: remove stub

[patch] [1/3] bus_policy_test: remove stub

0001-bus_policy_test-remove-stub.patch (text/plain), 2.07 KB, created by Simon McVittie on 2011-09-19 09:48:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-09-19 09:48:05 UTC

Size: 2.07 KB

patch

obsolete

>From c0aff8f86a0b6061ed92260b9232c72b5b0ed90b Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 22 Jun 2011 15:53:09 +0100
>Subject: [PATCH 1/3] bus_policy_test: remove stub
>
>---
> bus/policy.c    |   15 ---------------
> bus/test-main.c |    9 ---------
> bus/test.h      |    1 -
> 3 files changed, 0 insertions(+), 25 deletions(-)
>
>diff --git a/bus/policy.c b/bus/policy.c
>index 4841f47..34e8446 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 a8039d5..1b7c5be 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 45024e6..98a2c6b 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);
>-- 
>1.7.6.3
>

Actions: View | Splinter Review

Attachments on bug 41012: 51356 | 51357 | 51358

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.