tests: use igt_assert/igt_require more

With the new _f variants we can replace almost all of them.

Also remove a ton of checks for argc != 1, they're a bit useless ...

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 6 insertions, 10 deletions

diff --git a/tests/gem_fence_thrash.c b/tests/gem_fence_thrash.c
index 8c963afe..be196b09 100644
--- a/tests/gem_fence_thrash.c
+++ b/tests/gem_fence_thrash.c
@@ -128,20 +128,16 @@ _bo_write_verify(struct test *t)
 		for (i = 0; i < dwords; i++) {
 			a[i] = i;
 			v = a[i];
-			if (v != i) {
-				printf("tiling %s: write failed at %d (%x)\n",
-				       tile_str[t->tiling], i, v);
-				igt_fail(-1);
-			}
+			igt_assert_f(v == i,
+				     "tiling %s: write failed at %d (%x)\n",
+				     tile_str[t->tiling], i, v);
 		}
 
 		for (i = 0; i < dwords; i++) {
 			v = a[i];
-			if (v != i) {
-				printf("tiling %s: verify failed at %d (%x)\n",
-				       tile_str[t->tiling], i, v);
-				igt_fail(-2);
-			}
+			igt_assert_f(v == i,
+				     "tiling %s: verify failed at %d (%x)\n",
+				     tile_str[t->tiling], i, v);
 		}
 	}