diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-07-12 15:18:40 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-07-12 16:11:06 +0200 |
| commit | 1d72e2d85ba9d2e1c2d883bc8e472e332d476d11 (patch) | |
| tree | 4d60b60e915a0b34b3f46d6a1fcd21b2179c988f | |
| parent | 8805d05c1b2d6fd3e287dbd286fde215e47d5bd0 (diff) | |
test-stream-tube: pass if UNIX sockets are not implemented
https://bugs.freedesktop.org/show_bug.cgi?id=38997
| -rw-r--r-- | tests/dbus/stream-tube.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/dbus/stream-tube.c b/tests/dbus/stream-tube.c index d459626ec..cc2fca9fa 100644 --- a/tests/dbus/stream-tube.c +++ b/tests/dbus/stream-tube.c @@ -35,16 +35,20 @@ typedef struct { } TestContext; TestContext contexts[] = { +#ifdef HAVE_GIO_UNIX { FALSE, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_LOCALHOST }, + { FALSE, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_CREDENTIALS }, +#endif { FALSE, TP_SOCKET_ADDRESS_TYPE_IPV4, TP_SOCKET_ACCESS_CONTROL_LOCALHOST }, { FALSE, TP_SOCKET_ADDRESS_TYPE_IPV6, TP_SOCKET_ACCESS_CONTROL_LOCALHOST }, - { FALSE, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_CREDENTIALS }, { FALSE, TP_SOCKET_ADDRESS_TYPE_IPV4, TP_SOCKET_ACCESS_CONTROL_PORT }, +#ifdef HAVE_GIO_UNIX { TRUE, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_LOCALHOST }, + { TRUE, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_CREDENTIALS }, +#endif { TRUE, TP_SOCKET_ADDRESS_TYPE_IPV4, TP_SOCKET_ACCESS_CONTROL_LOCALHOST }, { TRUE, TP_SOCKET_ADDRESS_TYPE_IPV6, TP_SOCKET_ACCESS_CONTROL_LOCALHOST }, - { TRUE, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_CREDENTIALS }, { TRUE, TP_SOCKET_ADDRESS_TYPE_IPV4, TP_SOCKET_ACCESS_CONTROL_PORT }, { FALSE, NUM_TP_SOCKET_ADDRESS_TYPES, NUM_TP_SOCKET_ACCESS_CONTROLS } @@ -629,7 +633,7 @@ static void test_accept_twice (Test *test, gconstpointer data G_GNUC_UNUSED) { - create_tube_service (test, FALSE, TP_SOCKET_ADDRESS_TYPE_UNIX, + create_tube_service (test, FALSE, TP_SOCKET_ADDRESS_TYPE_IPV4, TP_SOCKET_ACCESS_CONTROL_LOCALHOST, FALSE); tp_stream_tube_channel_accept_async (test->tube, tube_accept_cb, test); @@ -650,7 +654,7 @@ test_accept_outgoing (Test *test, gconstpointer data G_GNUC_UNUSED) { /* Try to accept an outgoing channel */ - create_tube_service (test, TRUE, TP_SOCKET_ADDRESS_TYPE_UNIX, + create_tube_service (test, TRUE, TP_SOCKET_ADDRESS_TYPE_IPV4, TP_SOCKET_ACCESS_CONTROL_LOCALHOST, FALSE); tp_stream_tube_channel_accept_async (test->tube, tube_accept_cb, test); @@ -881,7 +885,7 @@ test_offer_bad_connection_conn_first (Test *test, gchar cm_buffer[BUFFER_SIZE]; /* Offer a tube to Bob */ - create_tube_service (test, TRUE, TP_SOCKET_ADDRESS_TYPE_UNIX, + create_tube_service (test, TRUE, TP_SOCKET_ADDRESS_TYPE_IPV4, TP_SOCKET_ACCESS_CONTROL_LOCALHOST, TRUE); tp_stream_tube_channel_offer_async (test->tube, NULL, tube_offer_cb, test); @@ -943,7 +947,7 @@ test_offer_bad_connection_sig_first (Test *test, gchar cm_buffer[BUFFER_SIZE]; /* Offer a tube to Bob */ - create_tube_service (test, TRUE, TP_SOCKET_ADDRESS_TYPE_UNIX, + create_tube_service (test, TRUE, TP_SOCKET_ADDRESS_TYPE_IPV4, TP_SOCKET_ACCESS_CONTROL_LOCALHOST, TRUE); tp_stream_tube_channel_offer_async (test->tube, NULL, tube_offer_cb, test); |