From: Ryan Lortie <desrt@desrt.ca>
Date: Mon, 20 Feb 2012 23:31:14 +0000 (+0100)
Subject: GApplication: disable a broken test
X-Git-Tag: android-x86-6.0-r1~456
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=31936039b0494201af3d6c0af3df14ad6bd1f8db;p=android-x86%2Fexternal-bluetooth-glib.git

GApplication: disable a broken test

This test made some invalid assumptions that are no longer true.
Disable it until we can figure out a better way.
---

diff --git a/gio/tests/gapplication.c b/gio/tests/gapplication.c
index 9f4942dc6..659cf5719 100644
--- a/gio/tests/gapplication.c
+++ b/gio/tests/gapplication.c
@@ -148,6 +148,14 @@ make_app (gboolean non_unique)
   return app;
 }
 
+#if 0
+Now that we register non-unique apps on the bus we need to fix the
+following test not to assume that it's safe to create multiple instances
+of the same app in one process.
+
+See https://bugzilla.gnome.org/show_bug.cgi?id=647986 for the patch that
+introduced this problem.
+
 static void
 test_nonunique (void)
 {
@@ -186,6 +194,7 @@ test_nonunique (void)
 
   session_bus_down ();
 }
+#endif
 
 static void
 properties (void)
@@ -299,7 +308,7 @@ main (int argc, char **argv)
 
   g_test_add_func ("/gapplication/no-dbus", test_nodbus);
   g_test_add_func ("/gapplication/basic", basic);
-  g_test_add_func ("/gapplication/non-unique", test_nonunique);
+/*  g_test_add_func ("/gapplication/non-unique", test_nonunique); */
   g_test_add_func ("/gapplication/properties", properties);
   g_test_add_func ("/gapplication/app-id", appid);