static void
die (const char *message)
{
- printf ("Bail out! test-ids: %s\n", message);
+ fprintf (stderr, "*** test-ids: %s", message);
exit (1);
}
-static int test_num = 0;
-
-/* This test outputs TAP syntax: http://testanything.org/ */
int
main (int argc,
char **argv)
DBusConnection *connection;
char *id;
char *server_id;
-
+
dbus_error_init (&error);
connection = dbus_bus_get (DBUS_BUS_SESSION, &error);
if (connection == NULL)
dbus_error_free (&error);
return 1;
}
- printf ("ok %d - connected to session bus\n", ++test_num);
server_id = dbus_connection_get_server_id (connection);
-
if (server_id == NULL)
die ("No bus server ID retrieved\n");
-
- printf ("ok %d - session bus server ID is %s\n", ++test_num, server_id);
-
+ /* printf("'%s'\n", server_id); */
if (strlen (server_id) != 32)
die ("Bus server id should have length 32\n");
-
- printf ("ok %d - session bus server ID length is 32\n", ++test_num);
-
dbus_free (server_id);
id = dbus_bus_get_id (connection, NULL);
if (id == NULL)
die ("No bus ID retrieved\n");
-
- printf ("ok %d - session bus ID is %s\n", ++test_num, id);
-
+ /* printf("'%s'\n", id); */
if (strlen (id) != 32)
die ("Bus ID should have length 32\n");
-
- printf ("ok %d - session bus ID length is 32\n", ++test_num);
-
dbus_free (id);
-
- printf ("1..%d\n", test_num);
+
+ _dbus_verbose ("*** Test IDs exiting\n");
+
return 0;
}
if (reply == NULL)
{
- printf ("Bail out! Reply is NULL ***\n");
+ printf ("Failed: Reply is NULL ***\n");
exit (1);
}
if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR)
{
- printf ("Bail out! Reply is error: %s ***\n", dbus_message_get_error_name (reply));
+ printf ("Failed: Reply is error: %s ***\n", dbus_message_get_error_name (reply));
exit (1);
}
}
-/* This test outputs TAP syntax: http://testanything.org/ */
int
main (int argc, char *argv[])
{
but if it does and we are stuck in a poll call then we know the
stuck in poll bug has come back to haunt us */
- printf ("# Testing stuck in poll\n");
+ printf ("*** Testing stuck in poll\n");
dbus_error_init (&error);
/* we just care about seconds */
delta = end_tv_sec - start_tv_sec;
- printf ("ok %d - %lis\n", i + 1, delta);
+ printf ("Iter %i: %lis\n", i, delta);
if (delta >= 5)
{
- printf ("Bail out! Looks like we might have been be stuck in poll ***\n");
+ printf ("Failed: looks like we might have been be stuck in poll ***\n");
exit (1);
}
}
dbus_connection_send (conn, method, NULL);
dbus_message_unref (method);
- printf ("# Testing completed\n1..%d\n", i);
+ printf ("Success ***\n");
exit (0);
}
if (reply == NULL)
{
- printf ("Bail out! Reply is NULL ***\n");
+ printf ("Failed: Reply is NULL ***\n");
exit (1);
}
if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR)
{
- printf ("Bail out! Reply is error: %s ***\n", dbus_message_get_error_name (reply));
+ printf ("Failed: Reply is error: %s ***\n", dbus_message_get_error_name (reply));
exit (1);
}
_method_call (conn, INT_MAX);
}
-/* This test outputs TAP syntax: http://testanything.org/ */
int
main (int argc, char *argv[])
{
DBusConnection *conn;
DBusError error;
- printf ("# Testing pending call timeouts\n");
+ printf ("*** Testing pending call timeouts\n");
dbus_error_init (&error);
/* we just care about seconds */
delta = end_tv_sec - start_tv_sec;
- printf ("ok %d - %lis\n", i + 1, delta);
+ printf ("Iter %i: %lis\n", i, delta);
}
method = dbus_message_new_method_call ("org.freedesktop.TestSuiteEchoService",
dbus_connection_send (conn, method, NULL);
dbus_message_unref (method);
- printf ("# Testing completed\n1..%d\n", i);
+ printf ("Success ***\n");
exit (0);
}
dbus_message_unref (msg);
if (!dbus_message_get_args (reply, &error, DBUS_TYPE_STRING, &addr, DBUS_TYPE_INVALID))
die ("couldn't parse message replym\n");
- printf ("# got private temp address %s\n", addr);
+ printf ("got private temp address %s\n", addr);
addr = strdup (addr);
if (!use_guid)
{
_dbus_loop_unref (loop);
}
-/* This test outputs TAP syntax: http://testanything.org/ */
int
main (int argc, char *argv[])
{
- int test_num = 0;
-
open_shutdown_private_connection (TRUE);
dbus_shutdown ();
- printf ("ok %d\n", ++test_num);
open_shutdown_private_connection (TRUE);
dbus_shutdown ();
- printf ("ok %d\n", ++test_num);
open_shutdown_private_connection (FALSE);
dbus_shutdown ();
- printf ("ok %d\n", ++test_num);
open_shutdown_private_connection (FALSE);
dbus_shutdown ();
- printf ("ok %d\n", ++test_num);
- printf ("1..%d\n", test_num);
return 0;
}
if (!server)
die (error.message);
testdata->private_addr = dbus_server_get_address (server);
- fprintf (stderr, "test server listening on %s\n", testdata->private_addr);
+ printf ("test server listening on %s\n", testdata->private_addr);
dbus_server_set_new_connection_function (server, new_connection_callback,
testdata, NULL);
static void
die (const char *message)
{
- printf ("Bail out! test-shutdown: %s", message);
+ fprintf (stderr, "*** test-shutdown: %s", message);
exit (1);
}
dbus_connection_unref (connection);
}
-/* This test outputs TAP syntax: http://testanything.org/ */
int
main (int argc,
char **argv)
{
- int test_num = 0;
-
open_destroy_shared_session_bus_connection ();
dbus_shutdown ();
- printf ("ok %d\n", ++test_num);
open_destroy_shared_session_bus_connection ();
dbus_shutdown ();
- printf ("ok %d\n", ++test_num);
open_destroy_shared_session_bus_connection ();
dbus_shutdown ();
- printf ("ok %d\n", ++test_num);
- printf ("1..%d\n", test_num);
+ _dbus_verbose ("*** Test shutdown exiting\n");
+
return 0;
}
}
}
-/* This test outputs TAP syntax: http://testanything.org/ */
+
int
main (int argc, char *argv[])
{
DBusCondVar *dispatch_cond1, *io_path_cond1;
DBusMutex *mutex2, *dispatch_mutex2, *io_path_mutex2;
DBusCondVar *dispatch_cond2, *io_path_cond2;
- int test_num = 0;
printf ("*** Testing late thread init\n");
check_mutex_lock (io_path_mutex1, io_path_mutex2, TRUE);
check_condvar_lock (dispatch_cond1, dispatch_cond2, TRUE);
check_condvar_lock (io_path_cond1, io_path_cond2, TRUE);
- printf ("ok %d\n", ++test_num);
dbus_threads_init_default ();
check_mutex_lock (io_path_mutex1, io_path_mutex2, TRUE);
check_condvar_lock (dispatch_cond1, dispatch_cond2, TRUE);
check_condvar_lock (io_path_cond1, io_path_cond2, TRUE);
- printf ("ok %d\n", ++test_num);
method = dbus_message_new_method_call ("org.freedesktop.TestSuiteEchoService",
"/org/freedesktop/TestSuite",
dbus_connection_send (conn, method, NULL);
dbus_message_unref (method);
- printf ("Testing completed\n1..%d\n", test_num);
+ printf ("Success ***\n");
exit (0);
}