AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

reftests: Be more graceful about errors

Browse Source 
The nice thing about that is that we can then log messages about the
errors to the log.

And then we can read the logs of the CI machinery and actually know
what's going on.
This commit is contained in:
Benjamin Otte 2019-04-13 01:48:28 +02:00
parent e0730bc118
commit 84351ba9e5
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
testsuite/reftests/gtk-reftest.c
View File

@ -86,10 +86,9 @@ parse_command_line (int *argc, char ***argv)
}
static const char *
get_output_dir (void)
get_output_dir (GError **error)
{
static const char *output_dir = NULL;
GError *error = NULL;
if (output_dir)
return output_dir;
@ -110,8 +109,9 @@ get_output_dir (void)
GFile *file;
file = g_file_new_for_path (output_dir);
g_assert (g_file_make_directory_with_parents (file, NULL, &error));
g_assert_no_error (error);
if (!g_file_make_directory_with_parents (file, NULL, error))
return NULL;
g_object_unref (file);
}
@ -140,12 +140,17 @@ get_components_of_test_file (const char *test_file,
}
static char *
get_output_file (const char *test_file,
const char *extension)
get_output_file (const char *test_file,
const char *extension,
GError **error)
{
const char *output_dir = get_output_dir ();
const char *output_dir;
char *result, *base;
output_dir = get_output_dir (error);
if (output_dir == NULL)
return NULL;
get_components_of_test_file (test_file, NULL, &base);
result = g_strconcat (output_dir, G_DIR_SEPARATOR_S, base, extension, NULL);
@ -242,7 +247,16 @@ save_image (cairo_surface_t *surface,
const char *test_name,
const char *extension)
{
char *filename = get_output_file (test_name, extension);
GError *error = NULL;
char *filename;
filename = get_output_file (test_name, extension, &error);
if (filename == NULL)
{
g_test_message ("Not storing test result image: %s", error->message);
g_error_free (error);
return;
}
g_test_message ("Storing test result image at %s", filename);
g_assert (cairo_surface_write_to_png (surface, filename) == CAIRO_STATUS_SUCCESS);