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>

1 files changed, 5 insertions, 11 deletions

diff --git a/tests/gem_userptr_blits.c b/tests/gem_userptr_blits.c
index b78edf8c..86c5d666 100644
--- a/tests/gem_userptr_blits.c
+++ b/tests/gem_userptr_blits.c
@@ -401,12 +401,10 @@ check_cpu(uint32_t *ptr, uint32_t val)
 	int i;
 
 	for (i = 0; i < WIDTH*HEIGHT; i++) {
-		if (ptr[i] != val) {
-			fprintf(stderr, "Expected 0x%08x, found 0x%08x "
-				"at offset 0x%08x\n",
-				val, ptr[i], i * 4);
-			abort();
-		}
+		igt_assert_f(ptr[i] == val,
+			     "Expected 0x%08x, found 0x%08x "
+			     "at offset 0x%08x\n",
+			     val, ptr[i], i * 4);
 		val++;
 	}
 }
@@ -770,11 +768,7 @@ static int test_coherency(int fd, int count)
 	igt_info("Using 2x%d 1MiB buffers\n", count);
 
 	ret = posix_memalign((void **)&memory, PAGE_SIZE, count*sizeof(linear));
-	if (ret != 0 || memory == NULL) {
-		fprintf(stderr, "Unable to allocate %lld bytes\n",
-			(long long)count*sizeof(linear));
-		return 1;
-	}
+	igt_assert(ret == 0 && memory);
 
 	gpu = malloc(sizeof(uint32_t)*count*4);
 	gpu_val = gpu + count;