fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-09 08:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: enable AF_UNIX loopback tests on !unix

Browse source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-02-09 11:34:35 +04:00 • committed by Simon McVittie
parent c6d6a2c9e6
commit 2be8c00a1d
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
test/loopback.c
View file

@ -99,9 +99,10 @@ setup (Fixture *f,
dbus_error_init (&f->e); dbus_error_init (&f->e);
g_queue_init (&f->server_messages); g_queue_init (&f->server_messages);
if ((g_str_has_prefix (addr, "tcp:") || if ((g_str_has_prefix (addr, "unix:") && !test_check_af_unix_works ()) ||
g_str_has_prefix (addr, "nonce-tcp:")) && ((g_str_has_prefix (addr, "tcp:") ||
!test_check_tcp_works ()) g_str_has_prefix (addr, "nonce-tcp:")) &&
!test_check_tcp_works ()))
{ {
f->skip = TRUE; f->skip = TRUE;
return; return;
@ -116,7 +117,6 @@ setup (Fixture *f,
test_server_setup (f->ctx, f->server); test_server_setup (f->ctx, f->server);
} }
#ifdef DBUS_UNIX
static void static void
setup_runtime (Fixture *f, setup_runtime (Fixture *f,
gconstpointer addr) gconstpointer addr)
@ -172,7 +172,6 @@ setup_no_runtime (Fixture *f,
dbus_free (listening_at); dbus_free (listening_at);
} }
#endif
static void static void
test_connect (Fixture *f, test_connect (Fixture *f,
@ -223,7 +222,6 @@ test_connect (Fixture *f,
g_assert_cmpstr (dbus_address_entry_get_value (entries[0], "noncefile"), g_assert_cmpstr (dbus_address_entry_get_value (entries[0], "noncefile"),
!=, NULL); !=, NULL);
} }
#ifdef DBUS_UNIX
else if (g_str_has_prefix (listening_address, "unix:tmpdir=")) else if (g_str_has_prefix (listening_address, "unix:tmpdir="))
{ {
g_assert_cmpstr (dbus_address_entry_get_method (entries[0]), ==, "unix"); g_assert_cmpstr (dbus_address_entry_get_method (entries[0]), ==, "unix");
@ -266,7 +264,6 @@ test_connect (Fixture *f,
/* No particular statement about the path here: for that see /* No particular statement about the path here: for that see
* setup_runtime() and setup_no_runtime() */ * setup_runtime() and setup_no_runtime() */
} }
#endif
else else
{ {
g_assert_not_reached (); g_assert_not_reached ();
@ -447,7 +444,6 @@ teardown (Fixture *f,
test_main_context_unref (f->ctx); test_main_context_unref (f->ctx);
} }
#ifdef DBUS_UNIX
static void static void
teardown_no_runtime (Fixture *f, teardown_no_runtime (Fixture *f,
gconstpointer addr) gconstpointer addr)
@ -485,7 +481,6 @@ teardown_runtime (Fixture *f,
g_free (f->saved_runtime_dir); g_free (f->saved_runtime_dir);
g_free (f->tmp_runtime_dir); g_free (f->tmp_runtime_dir);
} }
#endif
int int
main (int argc, main (int argc,
@ -516,7 +511,6 @@ main (int argc,
g_test_add ("/message/bad-guid/tcp", Fixture, "tcp:host=127.0.0.1", setup, g_test_add ("/message/bad-guid/tcp", Fixture, "tcp:host=127.0.0.1", setup,
test_bad_guid, teardown); test_bad_guid, teardown);
#ifdef DBUS_UNIX
g_test_add ("/connect/unix/tmpdir", Fixture, unix_tmpdir, setup, g_test_add ("/connect/unix/tmpdir", Fixture, unix_tmpdir, setup,
test_connect, teardown); test_connect, teardown);
g_test_add ("/message/unix/tmpdir", Fixture, unix_tmpdir, setup, g_test_add ("/message/unix/tmpdir", Fixture, unix_tmpdir, setup,
@ -535,7 +529,6 @@ main (int argc,
g_test_add ("/message/bad-guid/unix", Fixture, unix_tmpdir, setup, g_test_add ("/message/bad-guid/unix", Fixture, unix_tmpdir, setup,
test_bad_guid, teardown); test_bad_guid, teardown);
#endif
ret = g_test_run (); ret = g_test_run ();
dbus_shutdown (); dbus_shutdown ();