s/drmtest_subtest_block/drmtest_subtest/

The _block postfix meant to convey that a C statement/block must
follow can be misread as the verb to block. So drop it.

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

33 files changed, 118 insertions, 118 deletions

diff --git a/lib/drmtest.h b/lib/drmtest.h
index 0182e09c..70b4009f 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -99,9 +99,9 @@ void drmtest_progress(const char *header, uint64_t i, uint64_t total);
 jmp_buf drmtest_subtest_jmpbuf;
 void drmtest_subtest_init(int argc, char **argv);
 bool __drmtest_run_subtest(const char *subtest_name);
-#define drmtest_subtest_block(name) for (; __drmtest_run_subtest((name)) && \
-					 (setjmp(drmtest_subtest_jmpbuf) == 0); \
-					 drmtest_success())
+#define drmtest_subtest(name) for (; __drmtest_run_subtest((name)) && \
+				   (setjmp(drmtest_subtest_jmpbuf) == 0); \
+				   drmtest_success())
 bool drmtest_only_list_subtests(void);
 void drmtest_skip(void);
 void drmtest_success(void);
diff --git a/tests/gem_basic.c b/tests/gem_basic.c
index 900194db..06ae8a78 100644
--- a/tests/gem_basic.c
+++ b/tests/gem_basic.c
@@ -84,11 +84,11 @@ int main(int argc, char **argv)
 
 	fd = drm_open_any();
 
-	drmtest_subtest_block("bad-close")
+	drmtest_subtest("bad-close")
 		test_bad_close(fd);
-	drmtest_subtest_block("create-close")
+	drmtest_subtest("create-close")
 		test_create_close(fd);
-	drmtest_subtest_block("create-fd-close")
+	drmtest_subtest("create-fd-close")
 		test_create_fd_close(fd);
 
 	return 0;
diff --git a/tests/gem_caching.c b/tests/gem_caching.c
index ed58c28f..8b4be74f 100644
--- a/tests/gem_caching.c
+++ b/tests/gem_caching.c
@@ -141,7 +141,7 @@ int main(int argc, char **argv)
 	drmtest_init_aperture_trashers(bufmgr);
 	mappable_gtt_limit = gem_mappable_aperture_size();
 
-	drmtest_subtest_block("reads") {
+	drmtest_subtest("reads") {
 		if (!(flags & TEST_READ))
 			drmtest_skip();
 
@@ -171,7 +171,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	drmtest_subtest_block("writes") {
+	drmtest_subtest("writes") {
 		if (!(flags & TEST_WRITE))
 			drmtest_skip();
 
@@ -223,7 +223,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	drmtest_subtest_block("read-writes") {
+	drmtest_subtest("read-writes") {
 		if (!((flags & TEST_BOTH) == TEST_BOTH))
 			drmtest_skip();
 
diff --git a/tests/gem_cpu_concurrent_blit.c b/tests/gem_cpu_concurrent_blit.c
index 7bcfcd84..45c47d24 100644
--- a/tests/gem_cpu_concurrent_blit.c
+++ b/tests/gem_cpu_concurrent_blit.c
@@ -117,7 +117,7 @@ main(int argc, char **argv)
 	}
 
 	/* try to overwrite the source values */
-	drmtest_subtest_block("overwrite-source") {
+	drmtest_subtest("overwrite-source") {
 		for (i = 0; i < num_buffers; i++) {
 			set_bo(src[i], i, width, height);
 			set_bo(dst[i], i, width, height);
@@ -131,7 +131,7 @@ main(int argc, char **argv)
 	}
 
 	/* try to read the results before the copy completes */
-	drmtest_subtest_block("early-read") {
+	drmtest_subtest("early-read") {
 		for (i = num_buffers; i--; )
 			set_bo(src[i], 0xdeadbeef, width, height);
 		for (i = 0; i < num_buffers; i++)
@@ -141,7 +141,7 @@ main(int argc, char **argv)
 	}
 
 	/* and finally try to trick the kernel into loosing the pending write */
-	drmtest_subtest_block("gpu-read-after-write") {
+	drmtest_subtest("gpu-read-after-write") {
 		for (i = num_buffers; i--; )
 			set_bo(src[i], 0xabcdabcd, width, height);
 		for (i = 0; i < num_buffers; i++)
@@ -155,7 +155,7 @@ main(int argc, char **argv)
 	drmtest_fork_signal_helper();
 
 	/* try to overwrite the source values */
-	drmtest_subtest_block("overwrite-source-interruptible") {
+	drmtest_subtest("overwrite-source-interruptible") {
 		for (loop = 0; loop < 10; loop++) {
 			gem_quiescent_gpu(fd);
 			for (i = 0; i < num_buffers; i++) {
@@ -172,7 +172,7 @@ main(int argc, char **argv)
 	}
 
 	/* try to read the results before the copy completes */
-	drmtest_subtest_block("early-read-interruptible") {
+	drmtest_subtest("early-read-interruptible") {
 		for (loop = 0; loop < 10; loop++) {
 			gem_quiescent_gpu(fd);
 			for (i = num_buffers; i--; )
@@ -185,7 +185,7 @@ main(int argc, char **argv)
 	}
 
 	/* and finally try to trick the kernel into loosing the pending write */
-	drmtest_subtest_block("gpu-read-after-write-interruptible") {
+	drmtest_subtest("gpu-read-after-write-interruptible") {
 		for (loop = 0; loop < 10; loop++) {
 			gem_quiescent_gpu(fd);
 			for (i = num_buffers; i--; )
diff --git a/tests/gem_cs_tlb.c b/tests/gem_cs_tlb.c
index 0378fdb9..22129088 100644
--- a/tests/gem_cs_tlb.c
+++ b/tests/gem_cs_tlb.c
@@ -160,18 +160,18 @@ int main(int argc, char **argv)
 		sleep(5); /* needs more serious ducttape */
 	}
 
-	drmtest_subtest_block("render")
+	drmtest_subtest("render")
 		run_on_ring(fd, I915_EXEC_RENDER, "render");
 
-	drmtest_subtest_block("bsd")
+	drmtest_subtest("bsd")
 		if (gem_check_bsd(fd))
 			run_on_ring(fd, I915_EXEC_BSD, "bsd");
 
-	drmtest_subtest_block("blt")
+	drmtest_subtest("blt")
 		if (gem_check_blt(fd))
 			run_on_ring(fd, I915_EXEC_BLT, "blt");
 
-	drmtest_subtest_block("vebox")
+	drmtest_subtest("vebox")
 		if (gem_check_vebox(fd))
 			run_on_ring(fd, LOCAL_I915_EXEC_VEBOX, "vebox");
 
diff --git a/tests/gem_dummy_reloc_loop.c b/tests/gem_dummy_reloc_loop.c
index 2d0a2450..e720ffaa 100644
--- a/tests/gem_dummy_reloc_loop.c
+++ b/tests/gem_dummy_reloc_loop.c
@@ -160,13 +160,13 @@ int main(int argc, char **argv)
 		exit(-1);
 	}
 
-	drmtest_subtest_block("render") {
+	drmtest_subtest("render") {
 		printf("running dummy loop on render\n");
 		dummy_reloc_loop(I915_EXEC_RENDER);
 		printf("dummy loop run on render completed\n");
 	}
 
-	drmtest_subtest_block("bsd") {
+	drmtest_subtest("bsd") {
 		if (gem_check_bsd(fd)) {
 			sleep(2);
 			printf("running dummy loop on bsd\n");
@@ -175,7 +175,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	drmtest_subtest_block("blt") {
+	drmtest_subtest("blt") {
 		if (gem_check_blt(fd)) {
 			sleep(2);
 			printf("running dummy loop on blt\n");
@@ -184,7 +184,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	drmtest_subtest_block("vebox") {
+	drmtest_subtest("vebox") {
 		if (gem_check_vebox(fd)) {
 			sleep(2);
 			printf("running dummy loop on vebox\n");
@@ -193,7 +193,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	drmtest_subtest_block("mixed") {
+	drmtest_subtest("mixed") {
 		if (num_rings > 1) {
 			sleep(2);
 			printf("running dummy loop on random rings\n");
diff --git a/tests/gem_exec_bad_domains.c b/tests/gem_exec_bad_domains.c
index 53c33fd0..df8f1f42 100644
--- a/tests/gem_exec_bad_domains.c
+++ b/tests/gem_exec_bad_domains.c
@@ -166,7 +166,7 @@ int main(int argc, char **argv)
 
 	tmp = drm_intel_bo_alloc(bufmgr, "tmp", 128 * 128, 4096);
 
-	drmtest_subtest_block("cpu-domain") {
+	drmtest_subtest("cpu-domain") {
 		BEGIN_BATCH(2);
 		OUT_BATCH(0);
 		OUT_RELOC(tmp, I915_GEM_DOMAIN_CPU, 0, 0);
@@ -188,7 +188,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	drmtest_subtest_block("gtt-domain") {
+	drmtest_subtest("gtt-domain") {
 		BEGIN_BATCH(2);
 		OUT_BATCH(0);
 		OUT_RELOC(tmp, I915_GEM_DOMAIN_GTT, 0, 0);
@@ -212,7 +212,7 @@ int main(int argc, char **argv)
 
 #if 0 /* kernel checks have been eased, doesn't reject conflicting write domains
 	 any more */
-	drmtest_subtest_block("conflicting-write-domain") {
+	drmtest_subtest("conflicting-write-domain") {
 		BEGIN_BATCH(4);
 		OUT_BATCH(0);
 		OUT_RELOC(tmp, I915_GEM_DOMAIN_RENDER,
@@ -229,10 +229,10 @@ int main(int argc, char **argv)
 	}
 #endif
 
-	drmtest_subtest_block("double-write-domain")
+	drmtest_subtest("double-write-domain")
 		multi_write_domain(fd);
 
-	drmtest_subtest_block("invalid-gpu-domain") {
+	drmtest_subtest("invalid-gpu-domain") {
 		BEGIN_BATCH(2);
 		OUT_BATCH(0);
 		OUT_RELOC(tmp, ~(I915_GEM_GPU_DOMAINS | I915_GEM_DOMAIN_GTT | I915_GEM_DOMAIN_CPU),
diff --git a/tests/gem_exec_faulting_reloc.c b/tests/gem_exec_faulting_reloc.c
index d9c9db33..ffc9704b 100644
--- a/tests/gem_exec_faulting_reloc.c
+++ b/tests/gem_exec_faulting_reloc.c
@@ -222,9 +222,9 @@ int main(int argc, char **argv)
 {
 	drmtest_subtest_init(argc, argv);
 
-	drmtest_subtest_block("normal")
+	drmtest_subtest("normal")
 		run(OBJECT_SIZE);
-	drmtest_subtest_block("no-prefault") {
+	drmtest_subtest("no-prefault") {
 		drmtest_disable_prefault();
 		run(OBJECT_SIZE);
 		drmtest_enable_prefault();
diff --git a/tests/gem_exec_nop.c b/tests/gem_exec_nop.c
index 688da21e..251e7264 100644
--- a/tests/gem_exec_nop.c
+++ b/tests/gem_exec_nop.c
@@ -119,18 +119,18 @@ int main(int argc, char **argv)
 	handle = gem_create(fd, 4096);
 	gem_write(fd, handle, 0, batch, sizeof(batch));
 
-	drmtest_subtest_block("render")
+	drmtest_subtest("render")
 		loop(fd, handle, I915_EXEC_RENDER, "render");
 
-	drmtest_subtest_block("bsd")
+	drmtest_subtest("bsd")
 		if (gem_check_blt(fd))
 			loop(fd, handle, I915_EXEC_BSD, "bsd");
 
-	drmtest_subtest_block("blt")
+	drmtest_subtest("blt")
 		if (gem_check_blt(fd))
 			loop(fd, handle, I915_EXEC_BLT, "blt");
 
-	drmtest_subtest_block("vebox")
+	drmtest_subtest("vebox")
 		if (gem_check_vebox(fd))
 			loop(fd, handle, LOCAL_I915_EXEC_VEBOX, "vebox");
 
diff --git a/tests/gem_fence_thrash.c b/tests/gem_fence_thrash.c
index a6cd6eea..0d858e8a 100644
--- a/tests/gem_fence_thrash.c
+++ b/tests/gem_fence_thrash.c
@@ -210,33 +210,33 @@ main(int argc, char **argv)
 	drmtest_subtest_init(argc, argv);
 	drmtest_skip_on_simulation();
 
-	drmtest_subtest_block("bo-write-verify-none")
+	drmtest_subtest("bo-write-verify-none")
 		assert (run_test(0, bo_write_verify, I915_TILING_NONE, 80) == 0);
 
-	drmtest_subtest_block("bo-write-verify-x")
+	drmtest_subtest("bo-write-verify-x")
 		assert (run_test(0, bo_write_verify, I915_TILING_X, 80) == 0);
 
-	drmtest_subtest_block("bo-write-verify-y")
+	drmtest_subtest("bo-write-verify-y")
 		assert (run_test(0, bo_write_verify, I915_TILING_Y, 80) == 0);
 
-	drmtest_subtest_block("bo-write-verify-threaded-none")
+	drmtest_subtest("bo-write-verify-threaded-none")
 		assert (run_test(5, bo_write_verify, I915_TILING_NONE, 2) == 0);
 
-	drmtest_subtest_block("bo-write-verify-threaded-x") {
+	drmtest_subtest("bo-write-verify-threaded-x") {
 		assert (run_test(2, bo_write_verify, I915_TILING_X, 2) == 0);
 		assert (run_test(5, bo_write_verify, I915_TILING_X, 2) == 0);
 		assert (run_test(10, bo_write_verify, I915_TILING_X, 2) == 0);
 		assert (run_test(20, bo_write_verify, I915_TILING_X, 2) == 0);
 	}
 
-	drmtest_subtest_block("bo-write-verify-threaded-y") {
+	drmtest_subtest("bo-write-verify-threaded-y") {
 		assert (run_test(2, bo_write_verify, I915_TILING_Y, 2) == 0);
 		assert (run_test(5, bo_write_verify, I915_TILING_Y, 2) == 0);
 		assert (run_test(10, bo_write_verify, I915_TILING_Y, 2) == 0);
 		assert (run_test(20, bo_write_verify, I915_TILING_Y, 2) == 0);
 	}
 
-	drmtest_subtest_block("bo-copy")
+	drmtest_subtest("bo-copy")
 		assert(run_test(1, bo_copy, I915_TILING_X, 1) == 0);
 
 	return 0;
diff --git a/tests/gem_flink.c b/tests/gem_flink.c
index abdbfca6..e8bee554 100644
--- a/tests/gem_flink.c
+++ b/tests/gem_flink.c
@@ -158,15 +158,15 @@ int main(int argc, char **argv)
 
 	fd = drm_open_any();
 
-	drmtest_subtest_block("basic")
+	drmtest_subtest("basic")
 		test_flink(fd);
-	drmtest_subtest_block("double-flink")
+	drmtest_subtest("double-flink")
 		test_double_flink(fd);
-	drmtest_subtest_block("bad-flink")
+	drmtest_subtest("bad-flink")
 		test_bad_flink(fd);
-	drmtest_subtest_block("bad-open")
+	drmtest_subtest("bad-open")
 		test_bad_open(fd);
-	drmtest_subtest_block("flink-lifetime")
+	drmtest_subtest("flink-lifetime")
 		test_flink_lifetime(fd);
 
 	return 0;
diff --git a/tests/gem_flink_race.c b/tests/gem_flink_race.c
index 4c846e05..3f2fce32 100644
--- a/tests/gem_flink_race.c
+++ b/tests/gem_flink_race.c
@@ -197,10 +197,10 @@ int main(int argc, char **argv)
 
 	drmtest_subtest_init(argc, argv);
 
-	drmtest_subtest_block("flink_name")
+	drmtest_subtest("flink_name")
 		test_flink_name();
 
-	drmtest_subtest_block("flink_close")
+	drmtest_subtest("flink_close")
 		test_flink_close();
 
 	return 0;
diff --git a/tests/gem_gtt_concurrent_blit.c b/tests/gem_gtt_concurrent_blit.c
index 63fbcc27..3f3527a9 100644
--- a/tests/gem_gtt_concurrent_blit.c
+++ b/tests/gem_gtt_concurrent_blit.c
@@ -120,7 +120,7 @@ main(int argc, char **argv)
 	}
 
 	/* try to overwrite the source values */
-	drmtest_subtest_block("overwrite-source") {
+	drmtest_subtest("overwrite-source") {
 		for (i = 0; i < num_buffers; i++) {
 			set_bo(src[i], i, width, height);
 			set_bo(dst[i], i, width, height);
@@ -134,7 +134,7 @@ main(int argc, char **argv)
 	}
 
 	/* try to read the results before the copy completes */
-	drmtest_subtest_block("early-read") {
+	drmtest_subtest("early-read") {
 		for (i = num_buffers; i--; )
 			set_bo(src[i], 0xdeadbeef, width, height);
 		for (i = 0; i < num_buffers; i++)
@@ -144,7 +144,7 @@ main(int argc, char **argv)
 	}
 
 	/* and finally try to trick the kernel into loosing the pending write */
-	drmtest_subtest_block("gpu-read-after-write") {
+	drmtest_subtest("gpu-read-after-write") {
 		for (i = num_buffers; i--; )
 			set_bo(src[i], 0xabcdabcd, width, height);
 		for (i = 0; i < num_buffers; i++)
@@ -158,7 +158,7 @@ main(int argc, char **argv)
 	drmtest_fork_signal_helper();
 
 	/* try to read the results before the copy completes */
-	drmtest_subtest_block("overwrite-source-interruptible") {
+	drmtest_subtest("overwrite-source-interruptible") {
 		for (loop = 0; loop < 10; loop++) {
 			gem_quiescent_gpu(fd);
 			for (i = 0; i < num_buffers; i++) {
@@ -175,7 +175,7 @@ main(int argc, char **argv)
 	}
 
 	/* try to read the results before the copy completes */
-	drmtest_subtest_block("early-read-interruptible") {
+	drmtest_subtest("early-read-interruptible") {
 		for (loop = 0; loop < 10; loop++) {
 			gem_quiescent_gpu(fd);
 			for (i = num_buffers; i--; )
@@ -188,7 +188,7 @@ main(int argc, char **argv)
 	}
 
 	/* and finally try to trick the kernel into loosing the pending write */
-	drmtest_subtest_block("gpu-read-after-write-interruptible") {
+	drmtest_subtest("gpu-read-after-write-interruptible") {
 		for (loop = 0; loop < 10; loop++) {
 			gem_quiescent_gpu(fd);
 			for (i = num_buffers; i--; )
diff --git a/tests/gem_linear_blits.c b/tests/gem_linear_blits.c
index 661baa83..8b2b4150 100644
--- a/tests/gem_linear_blits.c
+++ b/tests/gem_linear_blits.c
@@ -264,10 +264,10 @@ int main(int argc, char **argv)
 		printf("Using %d 1MiB buffers\n", count);
 	}
 
-	drmtest_subtest_block("normal")
+	drmtest_subtest("normal")
 		run_test(fd, count);
 
-	drmtest_subtest_block("interruptible") {
+	drmtest_subtest("interruptible") {
 		drmtest_fork_signal_helper();
 		run_test(fd, count);
 		drmtest_stop_signal_helper();
diff --git a/tests/gem_mmap_gtt.c b/tests/gem_mmap_gtt.c
index 198dd59a..71ac7bea 100644
--- a/tests/gem_mmap_gtt.c
+++ b/tests/gem_mmap_gtt.c
@@ -164,19 +164,19 @@ int main(int argc, char **argv)
 
 	fd = drm_open_any();
 
-	drmtest_subtest_block("copy")
+	drmtest_subtest("copy")
 		test_copy(fd);
-	drmtest_subtest_block("read")
+	drmtest_subtest("read")
 		test_read(fd);
-	drmtest_subtest_block("write")
+	drmtest_subtest("write")
 		test_write(fd);
-	drmtest_subtest_block("write-gtt")
+	drmtest_subtest("write-gtt")
 		test_write_gtt(fd);
-	drmtest_subtest_block("read-no-prefault")
+	drmtest_subtest("read-no-prefault")
 		run_without_prefault(fd, test_read);
-	drmtest_subtest_block("write-no-prefault")
+	drmtest_subtest("write-no-prefault")
 		run_without_prefault(fd, test_write);
-	drmtest_subtest_block("write-gtt-no-prefault")
+	drmtest_subtest("write-gtt-no-prefault")
 		run_without_prefault(fd, test_write_gtt);
 
 	close(fd);
diff --git a/tests/gem_partial_pwrite_pread.c b/tests/gem_partial_pwrite_pread.c
index f6e6e32d..6c7d7e13 100644
--- a/tests/gem_partial_pwrite_pread.c
+++ b/tests/gem_partial_pwrite_pread.c
@@ -261,15 +261,15 @@ static void do_tests(int cache_level, const char *suffix)
 		gem_set_caching(fd, scratch_bo->handle, cache_level);
 
 	snprintf(name, sizeof(name), "reads%s", suffix);
-	drmtest_subtest_block(name)
+	drmtest_subtest(name)
 		test_partial_reads();
 
 	snprintf(name, sizeof(name), "writes%s", suffix);
-	drmtest_subtest_block(name)
+	drmtest_subtest(name)
 		test_partial_writes();
 
 	snprintf(name, sizeof(name), "writes-after-reads%s", suffix);
-	drmtest_subtest_block(name)
+	drmtest_subtest(name)
 		test_partial_read_writes();
 }
 
diff --git a/tests/gem_pread.c b/tests/gem_pread.c
index b5c0e95d..5f83a0db 100644
--- a/tests/gem_pread.c
+++ b/tests/gem_pread.c
@@ -107,7 +107,7 @@ int main(int argc, char **argv)
 	dst = gem_create(fd, object_size);
 	src = malloc(object_size);
 
-	drmtest_subtest_block("normal") {
+	drmtest_subtest("normal") {
 		for (count = 1; count <= 1<<17; count <<= 1) {
 			struct timeval start, end;
 
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
 	}
 
 	for (c = cache; c->level != -1; c++) {
-		drmtest_subtest_block(c->name) {
+		drmtest_subtest(c->name) {
 			gem_set_caching(fd, dst, c->level);
 
 			for (count = 1; count <= 1<<17; count <<= 1) {
diff --git a/tests/gem_pread_after_blit.c b/tests/gem_pread_after_blit.c
index 71dab345..da9b1b6f 100644
--- a/tests/gem_pread_after_blit.c
+++ b/tests/gem_pread_after_blit.c
@@ -191,37 +191,37 @@ main(int argc, char **argv)
 	dst[0] = drm_intel_bo_alloc(bufmgr, "dst bo", size, 4096);
 	dst[1] = drm_intel_bo_alloc(bufmgr, "dst bo", size, 4096);
 
-	drmtest_subtest_block("normal")
+	drmtest_subtest("normal")
 		do_test(fd, -1, src, start, dst, 1);
 
-	drmtest_subtest_block("interruptible") {
+	drmtest_subtest("interruptible") {
 		drmtest_fork_signal_helper();
 		do_test(fd, -1, src, start, dst, 100);
 		drmtest_stop_signal_helper();
 	}
 
-	drmtest_subtest_block("normal-uncached")
+	drmtest_subtest("normal-uncached")
 		do_test(fd, 0, src, start, dst, 1);
 
-	drmtest_subtest_block("interruptible-uncached") {
+	drmtest_subtest("interruptible-uncached") {
 		drmtest_fork_signal_helper();
 		do_test(fd, 0, src, start, dst, 100);
 		drmtest_stop_signal_helper();
 	}
 
-	drmtest_subtest_block("normal-snoop")
+	drmtest_subtest("normal-snoop")
 		do_test(fd, 1, src, start, dst, 1);
 
-	drmtest_subtest_block("interruptible-snoop") {
+	drmtest_subtest("interruptible-snoop") {
 		drmtest_fork_signal_helper();
 		do_test(fd, 1, src, start, dst, 100);
 		drmtest_stop_signal_helper();
 	}
 
-	drmtest_subtest_block("normal-display")
+	drmtest_subtest("normal-display")
 		do_test(fd, 2, src, start, dst, 1);
 
-	drmtest_subtest_block("interruptible-display") {
+	drmtest_subtest("interruptible-display") {
 		drmtest_fork_signal_helper();
 		do_test(fd, 2, src, start, dst, 100);
 		drmtest_stop_signal_helper();
diff --git a/tests/gem_prw_concurrent_blit.c b/tests/gem_prw_concurrent_blit.c
index 2e0d36ff..ce64254d 100644
--- a/tests/gem_prw_concurrent_blit.c
+++ b/tests/gem_prw_concurrent_blit.c
@@ -120,7 +120,7 @@ main(int argc, char **argv)
 	}
 
 	/* try to overwrite the source values */
-	drmtest_subtest_block("overwrite-source") {
+	drmtest_subtest("overwrite-source") {
 		for (i = 0; i < num_buffers; i++) {
 			set_bo(src[i], i, width, height);
 			set_bo(dst[i], i, width, height);
@@ -134,7 +134,7 @@ main(int argc, char **argv)
 	}
 
 	/* try to read the results before the copy completes */
-	drmtest_subtest_block("early-read") {
+	drmtest_subtest("early-read") {
 		for (i = num_buffers; i--; )
 			set_bo(src[i], 0xdeadbeef, width, height);
 		for (i = 0; i < num_buffers; i++)
@@ -144,7 +144,7 @@ main(int argc, char **argv)
 	}
 
 	/* and finally try to trick the kernel into loosing the pending write */
-	drmtest_subtest_block("gpu-read-after-write") {
+	drmtest_subtest("gpu-read-after-write") {
 		for (i = num_buffers; i--; )
 			set_bo(src[i], 0xabcdabcd, width, height);
 		for (i = 0; i < num_buffers; i++)
@@ -158,7 +158,7 @@ main(int argc, char **argv)
 	drmtest_fork_signal_helper();
 
 	/* try to read the results before the copy completes */
-	drmtest_subtest_block("overwrite-source-interruptible") {
+	drmtest_subtest("overwrite-source-interruptible") {
 		for (loop = 0; loop < 10; loop++) {
 			gem_quiescent_gpu(fd);
 			for (i = 0; i < num_buffers; i++) {
@@ -175,7 +175,7 @@ main(int argc, char **argv)
 	}
 
 	/* try to read the results before the copy completes */
-	drmtest_subtest_block("early-read-interruptible") {
+	drmtest_subtest("early-read-interruptible") {
 		for (loop = 0; loop < 10; loop++) {
 			gem_quiescent_gpu(fd);
 			for (i = num_buffers; i--; )
@@ -188,7 +188,7 @@ main(int argc, char **argv)
 	}
 
 	/* and finally try to trick the kernel into loosing the pending write */
-	drmtest_subtest_block("gpu-read-after-write-interruptible") {
+	drmtest_subtest("gpu-read-after-write-interruptible") {
 		for (loop = 0; loop < 10; loop++) {
 			gem_quiescent_gpu(fd);
 			for (i = num_buffers; i--; )
diff --git a/tests/gem_pwrite.c b/tests/gem_pwrite.c
index 64da9ed4..53274043 100644
--- a/tests/gem_pwrite.c
+++ b/tests/gem_pwrite.c
@@ -115,7 +115,7 @@ int main(int argc, char **argv)
 	dst = gem_create(fd, object_size);
 	src = malloc(object_size);
 
-	drmtest_subtest_block("normal") {
+	drmtest_subtest("normal") {
 		for (count = 1; count <= 1<<17; count <<= 1) {
 			struct timeval start, end;
 
@@ -131,7 +131,7 @@ int main(int argc, char **argv)
 	}
 
 	for (c = cache; c->level != -1; c++) {
-		drmtest_subtest_block(c->name) {
+		drmtest_subtest(c->name) {
 			gem_set_caching(fd, dst, c->level);
 
 			for (count = 1; count <= 1<<17; count <<= 1) {
diff --git a/tests/gem_pwrite_pread.c b/tests/gem_pwrite_pread.c
index c8676093..e42de0a2 100644
--- a/tests/gem_pwrite_pread.c
+++ b/tests/gem_pwrite_pread.c
@@ -401,9 +401,9 @@ int main(int argc, char **argv)
 	gem_set_caching(fd, src, 0);
 	gem_set_caching(fd, dst, 0);
 
-	drmtest_subtest_block("uncached-copy-correctness")
+	drmtest_subtest("uncached-copy-correctness")
 		test_copy(fd, src, dst, tmp, object_size);
-	drmtest_subtest_block("uncached-copy-performance") {
+	drmtest_subtest("uncached-copy-performance") {
 		for (count = 1; count <= 1<<17; count <<= 1) {
 			struct timeval start, end;
 
@@ -418,9 +418,9 @@ int main(int argc, char **argv)
 		}
 	}
 
-	drmtest_subtest_block("uncached-pwrite-blt-gtt_mmap-correctness")
+	drmtest_subtest("uncached-pwrite-blt-gtt_mmap-correctness")
 		test_as_gtt_mmap(fd, src, dst, object_size);
-	drmtest_subtest_block("uncached-pwrite-blt-gtt_mmap-performance") {
+	drmtest_subtest("uncached-pwrite-blt-gtt_mmap-performance") {
 		for (count = 1; count <= 1<<17; count <<= 1) {
 			struct timeval start, end;
 
@@ -438,9 +438,9 @@ int main(int argc, char **argv)
 	gem_set_caching(fd, src, 1);
 	gem_set_caching(fd, dst, 1);
 
-	drmtest_subtest_block("snooped-copy-correctness")
+	drmtest_subtest("snooped-copy-correctness")
 		test_copy(fd, src, dst, tmp, object_size);
-	drmtest_subtest_block("snooped-copy-performance") {
+	drmtest_subtest("snooped-copy-performance") {
 		for (count = 1; count <= 1<<17; count <<= 1) {
 			struct timeval start, end;
 
@@ -455,9 +455,9 @@ int main(int argc, char **argv)
 		}
 	}
 
-	drmtest_subtest_block("snooped-pwrite-blt-cpu_mmap-correctness")
+	drmtest_subtest("snooped-pwrite-blt-cpu_mmap-correctness")
 		test_as_cpu_mmap(fd, src, dst, object_size);
-	drmtest_subtest_block("snooped-pwrite-blt-cpu_mmap-performance") {
+	drmtest_subtest("snooped-pwrite-blt-cpu_mmap-performance") {
 		for (count = 1; count <= 1<<17; count <<= 1) {
 			struct timeval start, end;
 
@@ -475,9 +475,9 @@ int main(int argc, char **argv)
 	gem_set_caching(fd, src, 2);
 	gem_set_caching(fd, dst, 2);
 
-	drmtest_subtest_block("display-copy-correctness")
+	drmtest_subtest("display-copy-correctness")
 		test_copy(fd, src, dst, tmp, object_size);
-	drmtest_subtest_block("display-copy-performance") {
+	drmtest_subtest("display-copy-performance") {
 		for (count = 1; count <= 1<<17; count <<= 1) {
 			struct timeval start, end;
 
@@ -492,9 +492,9 @@ int main(int argc, char **argv)
 		}
 	}
 
-	drmtest_subtest_block("display-pwrite-blt-gtt_mmap-correctness")
+	drmtest_subtest("display-pwrite-blt-gtt_mmap-correctness")
 		test_as_gtt_mmap(fd, src, dst, object_size);
-	drmtest_subtest_block("display-pwrite-blt-gtt_mmap-performance") {
+	drmtest_subtest("display-pwrite-blt-gtt_mmap-performance") {
 		for (count = 1; count <= 1<<17; count <<= 1) {
 			struct timeval start, end;
 
diff --git a/tests/gem_ringfill.c b/tests/gem_ringfill.c
index 1f5faf3f..eb9435e1 100644
--- a/tests/gem_ringfill.c
+++ b/tests/gem_ringfill.c
@@ -214,7 +214,7 @@ int main(int argc, char **argv)
 	drm_intel_bufmgr_gem_enable_reuse(bufmgr);
 	batch = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd));
 
-	drmtest_subtest_block("blitter")
+	drmtest_subtest("blitter")
 		fails += check_ring(bufmgr, batch, "blt", blt_copy);
 
 	/* Strictly only required on architectures with a separate BLT ring,
@@ -222,7 +222,7 @@ int main(int argc, char **argv)
 	 */
 	copy = get_render_copyfunc(batch->devid);
 
-	drmtest_subtest_block("render") {
+	drmtest_subtest("render") {
 		if (copy)
 			fails += check_ring(bufmgr, batch, "render", copy);
 	}
diff --git a/tests/gem_set_tiling_vs_blt.c b/tests/gem_set_tiling_vs_blt.c
index 56a8203a..06fd2f1d 100644
--- a/tests/gem_set_tiling_vs_blt.c
+++ b/tests/gem_set_tiling_vs_blt.c
@@ -246,7 +246,7 @@ int main(int argc, char **argv)
 	devid = intel_get_drm_devid(fd);
 	batch = intel_batchbuffer_alloc(bufmgr, devid);
 
-	drmtest_subtest_block("untiled-to-tiled") {
+	drmtest_subtest("untiled-to-tiled") {
 		printf("testing untiled->tiled transisition:\n");
 		tiling = I915_TILING_NONE;
 		tiling_after = I915_TILING_X;
@@ -255,7 +255,7 @@ int main(int argc, char **argv)
 		assert(tiling_after == I915_TILING_X);
 	}
 
-	drmtest_subtest_block("tiled-to-untiled") {
+	drmtest_subtest("tiled-to-untiled") {
 		printf("testing tiled->untiled transisition:\n");
 		tiling = I915_TILING_X;
 		tiling_after = I915_TILING_NONE;
@@ -264,7 +264,7 @@ int main(int argc, char **argv)
 		assert(tiling_after == I915_TILING_NONE);
 	}
 
-	drmtest_subtest_block("tiled-to-tiled") {
+	drmtest_subtest("tiled-to-tiled") {
 		printf("testing tiled->tiled transisition:\n");
 		tiling = I915_TILING_X;
 		tiling_after = I915_TILING_X;
diff --git a/tests/gem_suspend.c b/tests/gem_suspend.c
index e252d141..a101c75a 100644
--- a/tests/gem_suspend.c
+++ b/tests/gem_suspend.c
@@ -105,10 +105,10 @@ int main(int argc, char **argv)
 
 	fd = drm_open_any();
 
-	drmtest_subtest_block("fence-restore-tiled2untiled")
+	drmtest_subtest("fence-restore-tiled2untiled")
 		test_fence_restore(fd, true);
 
-	drmtest_subtest_block("fence-restore-untiled")
+	drmtest_subtest("fence-restore-untiled")
 		test_fence_restore(fd, false);
 
 	close(fd);
diff --git a/tests/gem_tiled_blits.c b/tests/gem_tiled_blits.c
index ddb5b79c..2d944b10 100644
--- a/tests/gem_tiled_blits.c
+++ b/tests/gem_tiled_blits.c
@@ -220,10 +220,10 @@ int main(int argc, char **argv)
 	drm_intel_bufmgr_gem_set_vma_cache_size(bufmgr, 32);
 	batch = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd));
 
-	drmtest_subtest_block("normal")
+	drmtest_subtest("normal")
 		run_test(count);
 
-	drmtest_subtest_block("interruptible") {
+	drmtest_subtest("interruptible") {
 		drmtest_fork_signal_helper();
 		run_test(count);
 		drmtest_stop_signal_helper();
diff --git a/tests/gem_tiled_partial_pwrite_pread.c b/tests/gem_tiled_partial_pwrite_pread.c
index 8e684062..d3f94643 100644
--- a/tests/gem_tiled_partial_pwrite_pread.c
+++ b/tests/gem_tiled_partial_pwrite_pread.c
@@ -303,13 +303,13 @@ int main(int argc, char **argv)
 	drmtest_init_aperture_trashers(bufmgr);
 	mappable_gtt_limit = gem_mappable_aperture_size();
 
-	drmtest_subtest_block("reads")
+	drmtest_subtest("reads")
 		test_partial_reads();
 
-	drmtest_subtest_block("writes")
+	drmtest_subtest("writes")
 		test_partial_writes();
 
-	drmtest_subtest_block("writes-after-reads")
+	drmtest_subtest("writes-after-reads")
 		test_partial_read_writes();
 
 	drmtest_cleanup_aperture_trashers();
diff --git a/tests/gem_write_read_ring_switch.c b/tests/gem_write_read_ring_switch.c
index bd50520c..4fde091f 100644
--- a/tests/gem_write_read_ring_switch.c
+++ b/tests/gem_write_read_ring_switch.c
@@ -206,7 +206,7 @@ int main(int argc, char **argv)
 	}
 
 	for (i = 0; i < ARRAY_SIZE(tests); i++) {
-		drmtest_subtest_block(tests[i].name) {
+		drmtest_subtest(tests[i].name) {
 			if (has_ring(tests[i].ring))
 				run_test(tests[i].ring, tests[i].name);
 		}
@@ -216,7 +216,7 @@ int main(int argc, char **argv)
 	for (i = 0; i < ARRAY_SIZE(tests); i++) {
 		char name[180];
 		snprintf(name, sizeof(name), "%s-interruptible", tests[i].name);
-		drmtest_subtest_block(name)
+		drmtest_subtest(name)
 			run_test(tests[i].ring, name);
 	}
 	drmtest_stop_signal_helper();
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 1998bd99..6f365344 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -1186,7 +1186,7 @@ int main(int argc, char **argv)
 	batch = intel_batchbuffer_alloc(bufmgr, devid);
 
 	for (i = 0; i < sizeof(tests) / sizeof (tests[0]); i++) {
-		drmtest_subtest_block(tests[i].name) {
+		drmtest_subtest(tests[i].name) {
 			printf("running testcase: %s\n", tests[i].name);
 			run_test(tests[i].duration, tests[i].flags, tests[i].name);
 		}
@@ -1203,7 +1203,7 @@ int main(int argc, char **argv)
 		    !(tests[i].flags & TEST_VBLANK_ABSOLUTE))
 			continue;
 
-		drmtest_subtest_block(name) {
+		drmtest_subtest(name) {
 			printf("running testcase: %s\n", name);
 			run_test(tests[i].duration, tests[i].flags, name);
 		}
diff --git a/tests/kms_render.c b/tests/kms_render.c
index 5670d1b2..fe3127fe 100644
--- a/tests/kms_render.c
+++ b/tests/kms_render.c
@@ -247,7 +247,7 @@ int main(int argc, char **argv)
 	}
 
 	for (i = 0; i < ARRAY_SIZE(tests); i++) {
-		drmtest_subtest_block(tests[i].name)
+		drmtest_subtest(tests[i].name)
 			run_test(tests[i].name, tests[i].flags);
 	}
 
diff --git a/tests/prime_nv_api.c b/tests/prime_nv_api.c
index ad030b03..7efba6c6 100644
--- a/tests/prime_nv_api.c
+++ b/tests/prime_nv_api.c
@@ -569,7 +569,7 @@ int main(int argc, char **argv)
 	intel_batch = intel_batchbuffer_alloc(bufmgr, devid);
 
 #define xtest(name) \
-	drmtest_subtest_block(#name) \
+	drmtest_subtest(#name) \
 		if (test_##name()) \
 			exit(2);
 
diff --git a/tests/prime_nv_pcopy.c b/tests/prime_nv_pcopy.c
index 52f5e7b2..6dfd8ddf 100644
--- a/tests/prime_nv_pcopy.c
+++ b/tests/prime_nv_pcopy.c
@@ -1296,7 +1296,7 @@ int main(int argc, char **argv)
 	batch = intel_batchbuffer_alloc(bufmgr, devid);
 
 #define xtest(x, args...) \
-	drmtest_subtest_block( #x ) { \
+	drmtest_subtest( #x ) { \
 		ret = ((x)(args)); \
 		++run; \
 		if (ret) { \
diff --git a/tests/prime_nv_test.c b/tests/prime_nv_test.c
index c850eebb..25dede28 100644
--- a/tests/prime_nv_test.c
+++ b/tests/prime_nv_test.c
@@ -504,7 +504,7 @@ int main(int argc, char **argv)
 	intel_batch = intel_batchbuffer_alloc(bufmgr, devid);
 
 #define xtest(name) \
-	drmtest_subtest_block(#name) \
+	drmtest_subtest(#name) \
 		if (test_##name()) \
 			exit(2);
 
diff --git a/tests/prime_self_import.c b/tests/prime_self_import.c
index 8b0a1980..07914305 100644
--- a/tests/prime_self_import.c
+++ b/tests/prime_self_import.c
@@ -384,7 +384,7 @@ int main(int argc, char **argv)
 	drmtest_subtest_init(argc, argv);
 
 	for (i = 0; i < ARRAY_SIZE(tests); i++) {
-		drmtest_subtest_block(tests[i].name)
+		drmtest_subtest(tests[i].name)
 			tests[i].fn();
 	}