diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-05-14 09:56:53 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-05-14 09:56:53 +0200 |
| commit | 0b7ce4ac2929ea56dfde508d551163a5304c66d8 (patch) | |
| tree | 7af13f919437cc28ab61dbae3fee42a159fcfb6f /tests/gem_render_copy.c | |
| parent | e624fa8a2e1a31494c6e47a65e378e480882422d (diff) | |
tests: Use igt macros more
Often just folding together of the common if (cond) printf;
abort|igt_skip|igt_fail; pattern. But in a few cases I've ripped out
more since the igt macros will already print the condition and errno.
A few tests where more work (like ripping out return codes en masse)
is needed left as-is.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests/gem_render_copy.c')
| -rw-r--r-- | tests/gem_render_copy.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tests/gem_render_copy.c b/tests/gem_render_copy.c index 331b7ce5..fd26b43f 100644 --- a/tests/gem_render_copy.c +++ b/tests/gem_render_copy.c @@ -80,10 +80,7 @@ static void scratch_buf_write_to_png(struct igt_buf *buf, const char *filename) igt_buf_height(buf), buf->stride); ret = cairo_surface_write_to_png(surface, filename); - if (ret != CAIRO_STATUS_SUCCESS) { - fprintf(stderr, "%s: %s\n", __func__, - cairo_status_to_string(ret)); - } + igt_assert(ret == CAIRO_STATUS_SUCCESS); cairo_surface_destroy(surface); drm_intel_bo_unmap(buf->bo); } @@ -115,11 +112,9 @@ scratch_buf_check(data_t *data, struct igt_buf *buf, int x, int y, gem_read(data->drm_fd, buf->bo->handle, 0, data->linear, sizeof(data->linear)); val = data->linear[y * WIDTH + x]; - if (val != color) { - fprintf(stderr, "Expected 0x%08x, found 0x%08x at (%d,%d)\n", - color, val, x, y); - abort(); - } + igt_assert_f(val == color, + "Expected 0x%08x, found 0x%08x at (%d,%d)\n", + color, val, x, y); } int main(int argc, char **argv) |