sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

test/utils: Make meta_test_client_do*() not crash on NULL error

Browse source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2237>
This commit is contained in:
Jonas Ådahl 2022-01-14 22:07:15 +01:00 committed by Marge Bot
parent 68fd9bf534
commit 1886785b3d
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/tests/meta-test-utils.c
View file

@ -219,6 +219,7 @@ meta_test_client_dov (MetaTestClient *client,
{ {
GString *command = g_string_new (NULL); GString *command = g_string_new (NULL);
char *line = NULL; char *line = NULL;
GError *local_error = NULL;
while (TRUE) while (TRUE)
{ {
@ -239,7 +240,7 @@ meta_test_client_dov (MetaTestClient *client,
g_string_append_c (command, '\n'); g_string_append_c (command, '\n');
if (!g_data_output_stream_put_string (client->in, command->str, if (!g_data_output_stream_put_string (client->in, command->str,
client->cancellable, error)) client->cancellable, &local_error))
goto out; goto out;
g_data_input_stream_read_line_async (client->out, g_data_input_stream_read_line_async (client->out,
@ -248,7 +249,7 @@ meta_test_client_dov (MetaTestClient *client,
test_client_line_read, test_client_line_read,
client); client);
client->error = error; client->error = &local_error;
g_main_loop_run (client->loop); g_main_loop_run (client->loop);
line = client->line; line = client->line;
client->line = NULL; client->line = NULL;
@ -256,9 +257,9 @@ meta_test_client_dov (MetaTestClient *client,
if (!line) if (!line)
{ {
if (*error == NULL) if (!local_error)
{ {
g_set_error (error, g_set_error (&local_error,
META_TEST_CLIENT_ERROR, META_TEST_CLIENT_ERROR,
META_TEST_CLIENT_ERROR_RUNTIME_ERROR, META_TEST_CLIENT_ERROR_RUNTIME_ERROR,
"test client exited"); "test client exited");
@ -268,7 +269,7 @@ meta_test_client_dov (MetaTestClient *client,
if (strcmp (line, "OK") != 0) if (strcmp (line, "OK") != 0)
{ {
g_set_error (error, g_set_error (&local_error,
META_TEST_CLIENT_ERROR, META_TEST_CLIENT_ERROR,
META_TEST_CLIENT_ERROR_RUNTIME_ERROR, META_TEST_CLIENT_ERROR_RUNTIME_ERROR,
"%s", line); "%s", line);
@ -279,7 +280,15 @@ meta_test_client_dov (MetaTestClient *client,
g_string_free (command, TRUE); g_string_free (command, TRUE);
g_free (line); g_free (line);
return *error == NULL; if (local_error)
{
g_propagate_error (error, local_error);
return FALSE;
}
else
{
return TRUE;
}
} }
gboolean gboolean