X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bus%2Ftest-main.c;h=01d228704c1d52a5da06c18fe42b082a3383b5ef;hb=1200c464b6c9051340960e07f0d61a51dad71286;hp=a8039d5129ee612f646ebb5a85182c42f8f829b2;hpb=5df8c3db12590edd68e968975a335da9d0415e5a;p=platform%2Fupstream%2Fdbus.git

diff --git a/bus/test-main.c b/bus/test-main.c
index a8039d5..01d2287 100644
--- a/bus/test-main.c
+++ b/bus/test-main.c
@@ -28,10 +28,10 @@
 #include <dbus/dbus-string.h>
 #include <dbus/dbus-sysdeps.h>
 #include <dbus/dbus-internals.h>
-#include <dbus/dbus-message-private.h>
+#include <dbus/dbus-message-internal.h>
 #include "selinux.h"
 
-#ifdef DBUS_BUILD_TESTS
+#ifdef DBUS_ENABLE_EMBEDDED_TESTS
 static void
 die (const char *failure)
 {
@@ -52,7 +52,7 @@ check_memleaks (const char *name)
       die ("memleaks");
     }
 }
-#endif /* DBUS_BUILD_TESTS */
+#endif /* DBUS_ENABLE_EMBEDDED_TESTS */
 
 static DBusInitialFDs *initial_fds = NULL;
 
@@ -84,7 +84,7 @@ test_post_hook (void)
 int
 main (int argc, char **argv)
 {
-#ifdef DBUS_BUILD_TESTS
+#ifdef DBUS_ENABLE_EMBEDDED_TESTS
   const char *dir;
   const char *only;
   DBusString test_data_dir;
@@ -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 ();
@@ -190,7 +181,7 @@ main (int argc, char **argv)
 
   
   return 0;
-#else /* DBUS_BUILD_TESTS */
+#else /* DBUS_ENABLE_EMBEDDED_TESTS */
 
   printf ("Not compiled with test support\n");