tests/gem_set_tiling_vs_blt: convert to subtest infrastructure

2 files changed, 28 insertions, 21 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c2a99c1e..8900ad50 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,6 +22,7 @@ TESTS_progs_M = \
 	gem_mmap_gtt \
 	gem_partial_pwrite_pread \
 	gem_ringfill \
+	gem_set_tiling_vs_blt \
 	flip_test \
 	$(NULL)
 
@@ -41,7 +42,6 @@ TESTS_progs = \
 	gem_non_secure_batch \
 	gem_pwrite \
 	gem_pread_after_blit \
-	gem_set_tiling_vs_blt \
 	gem_set_tiling_vs_gtt \
 	gem_set_tiling_vs_pwrite \
 	gem_tiled_pread \
diff --git a/tests/gem_set_tiling_vs_blt.c b/tests/gem_set_tiling_vs_blt.c
index 5fa90d49..69dc7e64 100644
--- a/tests/gem_set_tiling_vs_blt.c
+++ b/tests/gem_set_tiling_vs_blt.c
@@ -233,6 +233,8 @@ int main(int argc, char **argv)
 	int i, fd;
 	uint32_t tiling, tiling_after;
 
+	drmtest_subtest_init(argc, argv);
+
 	for (i = 0; i < 1024*256; i++)
 		data[i] = i;
 
@@ -243,27 +245,32 @@ int main(int argc, char **argv)
 	devid = intel_get_drm_devid(fd);
 	batch = intel_batchbuffer_alloc(bufmgr, devid);
 
+	if (drmtest_run_subtest("untiled-to-tiled")) {
+		printf("testing untiled->tiled transisition:\n");
+		tiling = I915_TILING_NONE;
+		tiling_after = I915_TILING_X;
+		do_test(tiling, TEST_STRIDE, tiling_after, TEST_STRIDE);
+		assert(tiling == I915_TILING_NONE);
+		assert(tiling_after == I915_TILING_X);
+	}
 
-	printf("testing untiled->tiled transisition:\n");
-	tiling = I915_TILING_NONE;
-	tiling_after = I915_TILING_X;
-	do_test(tiling, TEST_STRIDE, tiling_after, TEST_STRIDE);
-	assert(tiling == I915_TILING_NONE);
-	assert(tiling_after == I915_TILING_X);
-
-	printf("testing tiled->untiled transisition:\n");
-	tiling = I915_TILING_X;
-	tiling_after = I915_TILING_NONE;
-	do_test(tiling, TEST_STRIDE, tiling_after, TEST_STRIDE);
-	assert(tiling == I915_TILING_X);
-	assert(tiling_after == I915_TILING_NONE);
-
-	printf("testing tiled->tiled transisition:\n");
-	tiling = I915_TILING_X;
-	tiling_after = I915_TILING_X;
-	do_test(tiling, TEST_STRIDE/2, tiling_after, TEST_STRIDE);
-	assert(tiling == I915_TILING_X);
-	assert(tiling_after == I915_TILING_X);
+	if (drmtest_run_subtest("tiled-to-untiled")) {
+		printf("testing tiled->untiled transisition:\n");
+		tiling = I915_TILING_X;
+		tiling_after = I915_TILING_NONE;
+		do_test(tiling, TEST_STRIDE, tiling_after, TEST_STRIDE);
+		assert(tiling == I915_TILING_X);
+		assert(tiling_after == I915_TILING_NONE);
+	}
+
+	if (drmtest_run_subtest("tiled-to-tiled")) {
+		printf("testing tiled->tiled transisition:\n");
+		tiling = I915_TILING_X;
+		tiling_after = I915_TILING_X;
+		do_test(tiling, TEST_STRIDE/2, tiling_after, TEST_STRIDE);
+		assert(tiling == I915_TILING_X);
+		assert(tiling_after == I915_TILING_X);
+	}
 
 	return 0;
 }