From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 28 Nov 2012 12:25:12 +0000 (+0100)
Subject: tests/gem_tiled_partial_pwrite_pread: convert to subtest infrastructure
X-Git-Tag: intel-gpu-tools-1.4~867
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df11a6f31d98eb56568a3fc234e6e6294c72e4ab;p=platform%2Fupstream%2Fintel-gpu-tools.git

tests/gem_tiled_partial_pwrite_pread: convert to subtest infrastructure
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8900ad5..a5d2529 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,6 +23,7 @@ TESTS_progs_M = \
 	gem_partial_pwrite_pread \
 	gem_ringfill \
 	gem_set_tiling_vs_blt \
+	gem_tiled_partial_pwrite_pread \
 	flip_test \
 	$(NULL)
 
@@ -46,7 +47,6 @@ TESTS_progs = \
 	gem_set_tiling_vs_pwrite \
 	gem_tiled_pread \
 	gem_tiled_pread_pwrite \
-	gem_tiled_partial_pwrite_pread \
 	gem_tiled_swapping \
 	gem_linear_blits \
 	gem_vmap_blits \
diff --git a/tests/gem_tiled_partial_pwrite_pread.c b/tests/gem_tiled_partial_pwrite_pread.c
index b28a386..f6df562 100644
--- a/tests/gem_tiled_partial_pwrite_pread.c
+++ b/tests/gem_tiled_partial_pwrite_pread.c
@@ -276,6 +276,8 @@ int main(int argc, char **argv)
 {
 	uint32_t tiling_mode = I915_TILING_X;
 
+	drmtest_subtest_init(argc, argv);
+
 	srandom(0xdeadbeef);
 
 	fd = drm_open_any();
@@ -300,11 +302,14 @@ int main(int argc, char **argv)
 	drmtest_init_aperture_trashers(bufmgr);
 	mappable_gtt_limit = gem_mappable_aperture_size();
 
-	test_partial_reads();
+	if (drmtest_run_subtest("reads"))
+		test_partial_reads();
 
-	test_partial_writes();
+	if (drmtest_run_subtest("writes"))
+		test_partial_writes();
 
-	test_partial_read_writes();
+	if (drmtest_run_subtest("writes-after-reads"))
+		test_partial_read_writes();
 
 	drmtest_cleanup_aperture_trashers();
 	drm_intel_bufmgr_destroy(bufmgr);