Tests: It is useless to unset "DBUS_SESSION_BUS_ADDRESS" manually

[platform/upstream/glib.git] / gio / tests / gapplication.c

diff --git a/gio/tests/gapplication.c b/gio/tests/gapplication.c
index f5a6e79..c9610c0 100644 (file)
--- a/gio/tests/gapplication.c
+++ b/gio/tests/gapplication.c
@@ -6,8 +6,6 @@
 #include "gdbus-tests.h"
 #include "gdbus-sessionbus.h"
 
-static const gchar *datapath;
-
 static gint outstanding_watches;
 static GMainLoop *main_loop;
 
@@ -67,7 +65,7 @@ spawn (const gchar *expected_stdout,
 
   va_start (ap, first_arg);
   array = g_ptr_array_new ();
-  g_ptr_array_add (array, g_build_filename (datapath, "basic-application", NULL));
+  g_ptr_array_add (array, g_test_build_filename (G_TEST_BUILT, "basic-application", NULL));
   for (arg = first_arg; arg; arg = va_arg (ap, const gchar *))
     g_ptr_array_add (array, g_strdup (arg));
   g_ptr_array_add (array, NULL);
@@ -322,7 +320,7 @@ nodbus_activate (GApplication *app)
 static void
 test_nodbus (void)
 {
-  char *binpath = g_build_filename (datapath, "unimportant", NULL);
+  char *binpath = g_test_build_filename (G_TEST_BUILT, "unimportant", NULL);
   gchar *argv[] = { binpath, NULL };
   GApplication *app;
 
@@ -352,7 +350,7 @@ noappid_activate (GApplication *app)
 static void
 test_noappid (void)
 {
-  char *binpath = g_build_filename (datapath, "unimportant", NULL);
+  char *binpath = g_test_build_filename (G_TEST_BUILT, "unimportant", NULL);
   gchar *argv[] = { binpath, NULL };
   GApplication *app;
 
@@ -391,7 +389,7 @@ static void
 test_quit (void)
 {
   GDBusConnection *c;
-  char *binpath = g_build_filename (datapath, "unimportant", NULL);
+  char *binpath = g_test_build_filename (G_TEST_BUILT, "unimportant", NULL);
   gchar *argv[] = { binpath, NULL };
   GApplication *app;
 
@@ -447,12 +445,10 @@ on_activate (GApplication *app)
 static void
 test_actions (void)
 {
-  char *binpath = g_build_filename (datapath, "unimportant", NULL);
+  char *binpath = g_test_build_filename (G_TEST_BUILT, "unimportant", NULL);
   gchar *argv[] = { binpath, NULL };
   GApplication *app;
 
-  g_unsetenv ("DBUS_SESSION_BUS_ADDRESS");
-
   app = g_application_new ("org.gtk.Unimportant",
                            G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (on_activate), NULL);
@@ -503,12 +499,10 @@ test_loc_cmd_app_class_init (TestLocCmdAppClass *klass)
 static void
 test_local_command_line (void)
 {
-  char *binpath = g_build_filename (datapath, "unimportant", NULL);
+  char *binpath = g_test_build_filename (G_TEST_BUILT, "unimportant", NULL);
   gchar *argv[] = { binpath, "-invalid", NULL };
   GApplication *app;
 
-  g_unsetenv ("DBUS_SESSION_BUS_ADDRESS");
-
   app = g_object_new (test_loc_cmd_app_get_type (),
                       "application-id", "org.gtk.Unimportant",
                       "flags", G_APPLICATION_FLAGS_NONE,
@@ -521,10 +515,6 @@ test_local_command_line (void)
 int
 main (int argc, char **argv)
 {
-  if (g_getenv ("G_TEST_DATA"))
-    datapath = g_getenv ("G_TEST_DATA");
-  else
-    datapath = SRCDIR;
   g_test_init (&argc, &argv, NULL);
 
   g_test_dbus_unset ();