brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/conform/texture-fbo: Log failure better

Browse Source 
We might as well print out exactly which assertion failed.
This commit is contained in:
Colin Walters 2013-06-24 20:30:40 +01:00
parent de20785b1b
commit 8ac9346046
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/conform/texture-fbo.c
View File

@ -102,16 +102,13 @@ validate_part (TestState *state,
/* Otherwise it should be the color for this division */ /* Otherwise it should be the color for this division */
correct_color = corner_colors + (y * SOURCE_DIVISIONS_X) + x; correct_color = corner_colors + (y * SOURCE_DIVISIONS_X) + x;
if (pixels == NULL || g_assert (pixels != NULL);
pixels[0] != correct_color->red || g_assert_cmpint (pixels[0], ==, correct_color->red);
pixels[1] != correct_color->green || g_assert_cmpint (pixels[1], ==, correct_color->green);
pixels[2] != correct_color->blue) g_assert_cmpint (pixels[2], ==, correct_color->blue);
pass = FALSE;
g_free (pixels); g_free (pixels);
} }
return pass;
} }
static void static void
@ -121,24 +118,24 @@ validate_result (TestState *state)
if (g_test_verbose ()) if (g_test_verbose ())
g_print ("Testing onscreen clone...\n"); g_print ("Testing onscreen clone...\n");
g_assert (validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, 0)); validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, 0);
ypos++; ypos++;
#if 0 /* this doesn't work */ #if 0 /* this doesn't work */
if (g_test_verbose ()) if (g_test_verbose ())
g_print ("Testing offscreen clone...\n"); g_print ("Testing offscreen clone...\n");
g_assert (validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, 0)); validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, 0);
#endif #endif
ypos++; ypos++;
if (g_test_verbose ()) if (g_test_verbose ())
g_print ("Testing onscreen clone with rectangular clip...\n"); g_print ("Testing onscreen clone with rectangular clip...\n");
g_assert (validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, ~1)); validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, ~1);
ypos++; ypos++;
if (g_test_verbose ()) if (g_test_verbose ())
g_print ("Testing onscreen clone with path clip...\n"); g_print ("Testing onscreen clone with path clip...\n");
g_assert (validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, 1)); validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, 1);
ypos++; ypos++;
/* Comment this out if you want visual feedback of what this test /* Comment this out if you want visual feedback of what this test