[gtk/wip/otte/for-master: 94/96] testuite: Improve compare-render binary
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/otte/for-master: 94/96] testuite: Improve compare-render binary
- Date: Tue, 21 May 2019 04:48:05 +0000 (UTC)
commit eb386134e35c229ef20d71163e8ae0c4e75a4031
Author: Benjamin Otte <otte redhat com>
Date: Mon May 20 03:29:11 2019 +0200
testuite: Improve compare-render binary
- Remove remains of g_test_*() functions
We're not a glib test, we're a simple binary.
- Handle nonexistence of reference image properly
Don't assert, but create the output image and the error out.
testsuite/gsk/compare-render.c | 39 +++++++++++++++++++++++++++------------
1 file changed, 27 insertions(+), 12 deletions(-)
---
diff --git a/testsuite/gsk/compare-render.c b/testsuite/gsk/compare-render.c
index 92691c8b34..b12f2459e3 100644
--- a/testsuite/gsk/compare-render.c
+++ b/testsuite/gsk/compare-render.c
@@ -61,8 +61,8 @@ deserialize_error_func (const GtkCssSection *section,
{
char *section_str = gtk_css_section_to_string (section);
- g_test_message ("Error at %s: %s", section_str, error->message);
- g_test_fail ();
+ g_print ("Error at %s: %s", section_str, error->message);
+ *((gboolean *) user_data) = FALSE;
free (section_str);
}
@@ -84,6 +84,7 @@ main (int argc, char **argv)
GskRenderNode *node;
const char *node_file;
const char *png_file;
+ gboolean success = TRUE;
g_assert (argc == 3);
@@ -109,12 +110,11 @@ main (int argc, char **argv)
{
g_print ("Could not open node file: %s\n", error->message);
g_clear_error (&error);
- g_test_fail ();
- return -1;
+ return 1;
}
bytes = g_bytes_new_take (contents, len);
- node = gsk_render_node_deserialize (bytes, deserialize_error_func, NULL);
+ node = gsk_render_node_deserialize (bytes, deserialize_error_func, &success);
g_bytes_unref (bytes);
g_assert_no_error (error);
@@ -135,15 +135,30 @@ main (int argc, char **argv)
/* Load the given reference png file */
reference_surface = cairo_image_surface_create_from_png (png_file);
- g_assert (reference_surface != NULL);
-
- /* Now compare the two */
- diff_surface = reftest_compare_surfaces (rendered_surface, reference_surface);
+ if (cairo_surface_status (reference_surface))
+ {
+ g_print ("Error loading reference surface: %s\n",
+ cairo_status_to_string (cairo_surface_status (reference_surface)));
+ success = FALSE;
+ }
+ else
+ {
+ /* Now compare the two */
+ diff_surface = reftest_compare_surfaces (rendered_surface, reference_surface);
+
+ if (diff_surface)
+ {
+ save_image (diff_surface, node_file, ".diff.png");
+ cairo_surface_destroy (diff_surface);
+ success = FALSE;
+ }
+ }
save_image (rendered_surface, node_file, ".out.png");
- if (diff_surface)
- save_image (diff_surface, node_file, ".diff.png");
+ cairo_surface_destroy (reference_surface);
+ cairo_surface_destroy (rendered_surface);
+ g_object_unref (texture);
- return diff_surface == NULL ? 0 : 1;
+ return success ? 0 : 1;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]