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

tests/gem_mmap_gtt: convert to subtest infrastructure
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 453dad9..8c96b51 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,6 +19,7 @@ TESTS_progs_M = \
 	gem_cs_tlb \
 	gem_flink \
 	gem_gtt_concurrent_blit \
+	gem_mmap_gtt \
 	flip_test \
 	$(NULL)
 
@@ -34,7 +35,6 @@ TESTS_progs = \
 	gem_readwrite \
 	gem_ringfill \
 	gem_mmap \
-	gem_mmap_gtt \
 	gem_mmap_offset_exhaustion \
 	gem_hangcheck_forcewake \
 	gem_non_secure_batch \
diff --git a/tests/gem_mmap_gtt.c b/tests/gem_mmap_gtt.c
index e7a4867..d759340 100644
--- a/tests/gem_mmap_gtt.c
+++ b/tests/gem_mmap_gtt.c
@@ -148,12 +148,18 @@ int main(int argc, char **argv)
 {
 	int fd;
 
+	drmtest_subtest_init(argc, argv);
+
 	fd = drm_open_any();
 
-	test_copy(fd);
-	test_read(fd);
-	test_write(fd);
-	test_write_gtt(fd);
+	if (drmtest_run_subtest("copy"))
+		test_copy(fd);
+	if (drmtest_run_subtest("read"))
+		test_read(fd);
+	if (drmtest_run_subtest("write"))
+		test_write(fd);
+	if (drmtest_run_subtest("write-gtt"))
+		test_write_gtt(fd);
 
 	close(fd);