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, 3 insertions, 16 deletions

diff --git a/tests/gem_ctx_bad_destroy.c b/tests/gem_ctx_bad_destroy.c
index 97a70666..77091314 100644
--- a/tests/gem_ctx_bad_destroy.c
+++ b/tests/gem_ctx_bad_destroy.c
@@ -43,19 +43,6 @@ struct local_drm_i915_context_destroy {
 
 #define CONTEXT_DESTROY_IOCTL DRM_IOWR(DRM_COMMAND_BASE + 0x2e, struct local_drm_i915_context_destroy)
 
-static void handle_bad(int ret, int lerrno, int expected, const char *desc)
-{
-	if (ret != 0 && lerrno != expected) {
-		fprintf(stderr, "%s - errno was %d, but should have been %d\n",
-				desc, lerrno, expected);
-		igt_fail(1);
-	} else if (ret == 0) {
-		fprintf(stderr, "%s - Command succeeded, but should have failed\n",
-			desc);
-		igt_fail(1);
-	}
-}
-
 igt_simple_main
 {
 	struct local_drm_i915_context_destroy destroy;
@@ -75,17 +62,17 @@ igt_simple_main
 
 	/* try double destroy */
 	ret = drmIoctl(fd, CONTEXT_DESTROY_IOCTL, &destroy);
-	handle_bad(ret, errno, ENOENT, "double destroy");
+	igt_assert(ret != 0 && errno == ENOENT);
 
 	/* destroy something random */
 	destroy.ctx_id = 2;
 	ret = drmIoctl(fd, CONTEXT_DESTROY_IOCTL, &destroy);
-	handle_bad(ret, errno, ENOENT, "random destroy");
+	igt_assert(ret != 0 && errno == ENOENT);
 
 	/* Try to destroy the default context */
 	destroy.ctx_id = 0;
 	ret = drmIoctl(fd, CONTEXT_DESTROY_IOCTL, &destroy);
-	handle_bad(ret, errno, ENOENT, "default destroy");
+	igt_assert(ret != 0 && errno == ENOENT);
 
 	close(fd);
 }