tests: use igt_exit() consistently with subtests

This is mostly important to get the SKIP reporting right, but I've
found a few stragglers that wanted to get converted over to the igt
result reporting completely.

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

22 files changed, 31 insertions, 44 deletions

diff --git a/tests/gem_basic.c b/tests/gem_basic.c
index 40efe01e..4b230b01 100644
--- a/tests/gem_basic.c
+++ b/tests/gem_basic.c
@@ -90,5 +90,5 @@ int main(int argc, char **argv)
 	igt_subtest("create-fd-close")
 		test_create_fd_close(fd);
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_concurrent_blit.c b/tests/gem_concurrent_blit.c
index 384bd7f1..b019f027 100644
--- a/tests/gem_concurrent_blit.c
+++ b/tests/gem_concurrent_blit.c
@@ -366,5 +366,5 @@ main(int argc, char **argv)
 	for (i = 0; i < ARRAY_SIZE(access_modes); i++)
 		run_modes(&access_modes[i]);
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_ctx_bad_exec.c b/tests/gem_ctx_bad_exec.c
index a83f65b9..86d06bf9 100644
--- a/tests/gem_ctx_bad_exec.c
+++ b/tests/gem_ctx_bad_exec.c
@@ -126,5 +126,5 @@ int main(int argc, char *argv[])
 	igt_subtest("blt")
 		igt_assert(exec(fd, handle, I915_EXEC_BLT, ctx_id) != 0);
 
-	igt_success();
+	igt_exit();
 }
diff --git a/tests/gem_exec_bad_domains.c b/tests/gem_exec_bad_domains.c
index 2eb7deee..c18a8902 100644
--- a/tests/gem_exec_bad_domains.c
+++ b/tests/gem_exec_bad_domains.c
@@ -260,5 +260,5 @@ int main(int argc, char **argv)
 
 	close(fd);
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_exec_faulting_reloc.c b/tests/gem_exec_faulting_reloc.c
index 3d981133..8287a077 100644
--- a/tests/gem_exec_faulting_reloc.c
+++ b/tests/gem_exec_faulting_reloc.c
@@ -229,5 +229,5 @@ int main(int argc, char **argv)
 		igt_enable_prefault();
 	}
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_fence_thrash.c b/tests/gem_fence_thrash.c
index 14d81b55..a5e96795 100644
--- a/tests/gem_fence_thrash.c
+++ b/tests/gem_fence_thrash.c
@@ -238,5 +238,5 @@ main(int argc, char **argv)
 	igt_subtest("bo-copy")
 		igt_assert(run_test(1, bo_copy, I915_TILING_X, 1) == 0);
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_flink.c b/tests/gem_flink.c
index 946860d7..600753cb 100644
--- a/tests/gem_flink.c
+++ b/tests/gem_flink.c
@@ -168,5 +168,5 @@ int main(int argc, char **argv)
 	igt_subtest("flink-lifetime")
 		test_flink_lifetime(fd);
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_flink_race.c b/tests/gem_flink_race.c
index ddf9b83c..0680b2e4 100644
--- a/tests/gem_flink_race.c
+++ b/tests/gem_flink_race.c
@@ -202,5 +202,5 @@ int main(int argc, char **argv)
 	igt_subtest("flink_close")
 		test_flink_close();
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_linear_blits.c b/tests/gem_linear_blits.c
index b3d916fd..b88b5839 100644
--- a/tests/gem_linear_blits.c
+++ b/tests/gem_linear_blits.c
@@ -272,5 +272,5 @@ int main(int argc, char **argv)
 		igt_stop_signal_helper();
 	}
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_mmap_gtt.c b/tests/gem_mmap_gtt.c
index f86b13ce..f2dca9ee 100644
--- a/tests/gem_mmap_gtt.c
+++ b/tests/gem_mmap_gtt.c
@@ -180,5 +180,5 @@ int main(int argc, char **argv)
 
 	close(fd);
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_readwrite.c b/tests/gem_readwrite.c
index df3ecee8..c511350d 100644
--- a/tests/gem_readwrite.c
+++ b/tests/gem_readwrite.c
@@ -142,5 +142,5 @@ int main(int argc, char **argv)
 
 	close(fd);
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_ringfill.c b/tests/gem_ringfill.c
index 5c66bcfa..9ba0967b 100644
--- a/tests/gem_ringfill.c
+++ b/tests/gem_ringfill.c
@@ -54,7 +54,6 @@ struct bo {
 };
 
 static const int width = 512, height = 512;
-static bool skipped_all = true;
 
 static void create_bo(drm_intel_bufmgr *bufmgr,
 		      struct bo *b,
@@ -122,7 +121,6 @@ static int check_ring(drm_intel_bufmgr *bufmgr,
 	int i;
 
 	snprintf(output, 100, "filling %s ring: ", ring);
-	skipped_all = false;
 
 	create_bo(bufmgr, &bo, ring);
 
@@ -202,7 +200,7 @@ int main(int argc, char **argv)
 	drm_intel_bufmgr *bufmgr;
 	struct intel_batchbuffer *batch;
 	render_copyfunc_t copy;
-	int fd, fails = 0;
+	int fd;
 
 	igt_subtest_init(argc, argv);
 	igt_skip_on_simulation();
@@ -214,22 +212,21 @@ int main(int argc, char **argv)
 	batch = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd));
 
 	igt_subtest("blitter")
-		fails += check_ring(bufmgr, batch, "blt", blt_copy);
+		check_ring(bufmgr, batch, "blt", blt_copy);
 
 	/* Strictly only required on architectures with a separate BLT ring,
 	 * but lets stress everybody.
 	 */
 	copy = get_render_copyfunc(batch->devid);
+	igt_require(copy);
 
-	igt_subtest("render") {
-		if (copy)
-			fails += check_ring(bufmgr, batch, "render", copy);
-	}
+	igt_subtest("render")
+		check_ring(bufmgr, batch, "render", copy);
 
 	intel_batchbuffer_free(batch);
 	drm_intel_bufmgr_destroy(bufmgr);
 
 	close(fd);
 
-	return skipped_all ? 77 : fails != 0;
+	igt_exit();
 }
diff --git a/tests/gem_set_tiling_vs_blt.c b/tests/gem_set_tiling_vs_blt.c
index d73c3aec..1d0ebdfb 100644
--- a/tests/gem_set_tiling_vs_blt.c
+++ b/tests/gem_set_tiling_vs_blt.c
@@ -272,5 +272,5 @@ int main(int argc, char **argv)
 		igt_assert(tiling_after == I915_TILING_X);
 	}
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_suspend.c b/tests/gem_suspend.c
index 4d88013e..63c8b87e 100644
--- a/tests/gem_suspend.c
+++ b/tests/gem_suspend.c
@@ -112,5 +112,5 @@ int main(int argc, char **argv)
 
 	close(fd);
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_tiled_blits.c b/tests/gem_tiled_blits.c
index 2d21e27c..9c97000d 100644
--- a/tests/gem_tiled_blits.c
+++ b/tests/gem_tiled_blits.c
@@ -233,5 +233,5 @@ int main(int argc, char **argv)
 
 	close(fd);
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_tiled_partial_pwrite_pread.c b/tests/gem_tiled_partial_pwrite_pread.c
index 34215208..3d70924f 100644
--- a/tests/gem_tiled_partial_pwrite_pread.c
+++ b/tests/gem_tiled_partial_pwrite_pread.c
@@ -316,5 +316,5 @@ int main(int argc, char **argv)
 
 	close(fd);
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 85d40bcf..bb43f954 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -1211,5 +1211,5 @@ int main(int argc, char **argv)
 
 	close(drm_fd);
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/kms_render.c b/tests/kms_render.c
index 953977aa..71be21f6 100644
--- a/tests/kms_render.c
+++ b/tests/kms_render.c
@@ -253,5 +253,5 @@ int main(int argc, char **argv)
 	if (!igt_only_list_subtests())
 		close(drm_fd);
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/prime_nv_api.c b/tests/prime_nv_api.c
index 2311d2f6..f6445822 100644
--- a/tests/prime_nv_api.c
+++ b/tests/prime_nv_api.c
@@ -594,5 +594,5 @@ int main(int argc, char **argv)
 	close(intel_fd);
 	close(nouveau_fd);
 
-	return ret;
+	igt_exit();
 }
diff --git a/tests/prime_nv_pcopy.c b/tests/prime_nv_pcopy.c
index b7aad707..6b870c6c 100644
--- a/tests/prime_nv_pcopy.c
+++ b/tests/prime_nv_pcopy.c
@@ -1265,7 +1265,7 @@ out:
 
 int main(int argc, char **argv)
 {
-	int ret, failed = 0, run = 0;
+	int ret;
 
 	igt_subtest_init(argc, argv);
 
@@ -1296,14 +1296,8 @@ int main(int argc, char **argv)
 	batch = intel_batchbuffer_alloc(bufmgr, devid);
 
 #define xtest(x, args...) \
-	igt_subtest( #x ) { \
-		ret = ((x)(args)); \
-		++run; \
-		if (ret) { \
-			++failed; \
-			fprintf(stderr, "prime_pcopy: failed " #x "\n"); \
-		} \
-	}
+	igt_subtest( #x ) \
+		igt_assert(((x)(args)) == 0); \
 
 	xtest(test1_macro);
 	xtest(test1_micro);
@@ -1331,8 +1325,5 @@ int main(int argc, char **argv)
 	close(intel_fd);
 	close(nouveau_fd);
 
-	if (!igt_only_list_subtests())
-		printf("Tests: %u run, %u failed\n", run, failed);
-
-	return failed;
+	igt_exit();
 }
diff --git a/tests/prime_nv_test.c b/tests/prime_nv_test.c
index 3b716aad..59fd9671 100644
--- a/tests/prime_nv_test.c
+++ b/tests/prime_nv_test.c
@@ -505,8 +505,7 @@ int main(int argc, char **argv)
 
 #define xtest(name) \
 	igt_subtest(#name) \
-		if (test_##name()) \
-			igt_fail(2);
+		igt_assert(test_##name() == 0);
 
 	xtest(i915_nv_sharing);
 	xtest(nv_i915_sharing);
@@ -525,5 +524,5 @@ int main(int argc, char **argv)
 	close(intel_fd);
 	close(nouveau_fd);
 
-	return ret;
+	igt_exit();
 }
diff --git a/tests/prime_self_import.c b/tests/prime_self_import.c
index 4a260d36..89bcffee 100644
--- a/tests/prime_self_import.c
+++ b/tests/prime_self_import.c
@@ -387,5 +387,5 @@ int main(int argc, char **argv)
 			tests[i].fn();
 	}
 
-	return 0;
+	igt_exit();
 }