Merge branch 'gdbus-tests-isolate-dirs' into 'main'

tests: Add G_TEST_OPTION_ISOLATE_DIRS to almost all gdbus tests

See merge request GNOME/glib!3088
This commit is contained in:
Simon McVittie 2022-11-23 17:20:44 +00:00
commit a241226f2e
22 changed files with 22 additions and 22 deletions

View File

@ -209,7 +209,7 @@ int
main (int argc, main (int argc,
char *argv[]) char *argv[])
{ {
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_add_func ("/gdbus/empty-address", test_empty_address); g_test_add_func ("/gdbus/empty-address", test_empty_address);
g_test_add_func ("/gdbus/unsupported-address", test_unsupported_address); g_test_add_func ("/gdbus/unsupported-address", test_unsupported_address);

View File

@ -287,7 +287,7 @@ main (int argc,
temp_dbus_keyrings_setup (); temp_dbus_keyrings_setup ();
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_add_func ("/gdbus/auth/client/EXTERNAL", auth_client_external); g_test_add_func ("/gdbus/auth/client/EXTERNAL", auth_client_external);
g_test_add_func ("/gdbus/auth/client/DBUS_COOKIE_SHA1", auth_client_dbus_cookie_sha1); g_test_add_func ("/gdbus/auth/client/DBUS_COOKIE_SHA1", auth_client_dbus_cookie_sha1);

View File

@ -80,7 +80,7 @@ int
main (int argc, main (int argc,
char *argv[]) char *argv[])
{ {
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_dbus_unset (); g_test_dbus_unset ();

View File

@ -385,7 +385,7 @@ int
main (int argc, main (int argc,
char *argv[]) char *argv[])
{ {
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_add ("/gdbus/close-pending", Fixture, "close", g_test_add ("/gdbus/close-pending", Fixture, "close",
setup, test_many_times, teardown); setup, test_many_times, teardown);

View File

@ -114,7 +114,7 @@ main (int argc,
gint ret; gint ret;
gchar *path; gchar *path;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
/* all the tests rely on a shared main loop */ /* all the tests rely on a shared main loop */
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);

View File

@ -225,7 +225,7 @@ main (int argc,
{ {
gint ret; gint ret;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
/* all the tests rely on a shared main loop */ /* all the tests rely on a shared main loop */
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);

View File

@ -1277,7 +1277,7 @@ main (int argc,
{ {
int ret; int ret;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
/* all the tests rely on a shared main loop */ /* all the tests rely on a shared main loop */
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);

View File

@ -260,7 +260,7 @@ int
main (int argc, main (int argc,
char *argv[]) char *argv[])
{ {
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_add_func ("/gdbus/registered-errors", test_registered_errors); g_test_add_func ("/gdbus/registered-errors", test_registered_errors);
g_test_add_func ("/gdbus/unregistered-errors", test_unregistered_errors); g_test_add_func ("/gdbus/unregistered-errors", test_unregistered_errors);

View File

@ -201,7 +201,7 @@ main (int argc,
{ {
gint i; gint i;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
for (i = 0; cases[i].name != NULL; i++) for (i = 0; cases[i].name != NULL; i++)
{ {

View File

@ -1966,7 +1966,7 @@ main (int argc,
{ {
gint ret; gint ret;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
/* all the tests rely on a shared main loop */ /* all the tests rely on a shared main loop */
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);

View File

@ -307,7 +307,7 @@ main (int argc,
{ {
gint ret; gint ret;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
/* all the tests rely on a shared main loop */ /* all the tests rely on a shared main loop */
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);

View File

@ -217,7 +217,7 @@ main (int argc,
{ {
setlocale (LC_ALL, "C"); setlocale (LC_ALL, "C");
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_add_func ("/gdbus/message/lock", message_lock); g_test_add_func ("/gdbus/message/lock", message_lock);
g_test_add_func ("/gdbus/message/copy", message_copy); g_test_add_func ("/gdbus/message/copy", message_copy);

View File

@ -1340,7 +1340,7 @@ main (int argc,
{ {
gint ret; gint ret;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_dbus_unset (); g_test_dbus_unset ();

View File

@ -209,7 +209,7 @@ main (int argc,
GDBusNodeInfo *introspection_data = NULL; GDBusNodeInfo *introspection_data = NULL;
gchar *tmpdir = NULL; gchar *tmpdir = NULL;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
introspection_data = g_dbus_node_info_new_for_xml (test_interface_introspection_xml, NULL); introspection_data = g_dbus_node_info_new_for_xml (test_interface_introspection_xml, NULL);
g_assert (introspection_data != NULL); g_assert (introspection_data != NULL);

View File

@ -250,7 +250,7 @@ int
main (int argc, main (int argc,
char *argv[]) char *argv[])
{ {
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_dbus_unset (); g_test_dbus_unset ();

View File

@ -203,7 +203,7 @@ main (int argc,
{ {
gint ret; gint ret;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
/* all the tests rely on a shared main loop */ /* all the tests rely on a shared main loop */
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);

View File

@ -260,7 +260,7 @@ main (int argc,
{ {
gint ret; gint ret;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
/* all the tests rely on a shared main loop */ /* all the tests rely on a shared main loop */
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);

View File

@ -1017,7 +1017,7 @@ main (int argc,
gint ret; gint ret;
GDBusNodeInfo *introspection_data = NULL; GDBusNodeInfo *introspection_data = NULL;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
introspection_data = g_dbus_node_info_new_for_xml (frob_dbus_interface_xml, NULL); introspection_data = g_dbus_node_info_new_for_xml (frob_dbus_interface_xml, NULL);
g_assert_nonnull (introspection_data); g_assert_nonnull (introspection_data);

View File

@ -1624,7 +1624,7 @@ main (int argc,
g_setenv ("LC_ALL", "C", TRUE); g_setenv ("LC_ALL", "C", TRUE);
setlocale (LC_ALL, "C"); setlocale (LC_ALL, "C");
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_add_func ("/gdbus/message-serialize/basic", g_test_add_func ("/gdbus/message-serialize/basic",
test_message_serialize_basic); test_message_serialize_basic);

View File

@ -2736,7 +2736,7 @@ int
main (int argc, main (int argc,
char *argv[]) char *argv[])
{ {
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_add_func ("/gdbus/codegen/annotations", test_annotations); g_test_add_func ("/gdbus/codegen/annotations", test_annotations);
g_test_add_func ("/gdbus/codegen/interface_stability", test_interface_stability); g_test_add_func ("/gdbus/codegen/interface_stability", test_interface_stability);

View File

@ -80,7 +80,7 @@ int
main (int argc, main (int argc,
char *argv[]) char *argv[])
{ {
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
/* This test simply ensures that we can bring the GTestDBus up and down a hand /* This test simply ensures that we can bring the GTestDBus up and down a hand
* full of times in a row, each time successfully activating the in-tree service * full of times in a row, each time successfully activating the in-tree service

View File

@ -677,7 +677,7 @@ main (int argc,
gint ret; gint ret;
gchar *path; gchar *path;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
session_bus_up (); session_bus_up ();