From 53e184b228b9bda43df75aa4ff919bc23f5caa09 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Wed, 5 Dec 2012 10:09:08 +0100 Subject: tests/gem_dummy_reloc_loop: some updates - convert to subtests - shut up stderr output for successful runs Signed-off-by: Daniel Vetter --- tests/gem_dummy_reloc_loop.c | 56 ++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 26 deletions(-) (limited to 'tests/gem_dummy_reloc_loop.c') diff --git a/tests/gem_dummy_reloc_loop.c b/tests/gem_dummy_reloc_loop.c index 82d8f77e..b67c7d34 100644 --- a/tests/gem_dummy_reloc_loop.c +++ b/tests/gem_dummy_reloc_loop.c @@ -127,10 +127,7 @@ int main(int argc, char **argv) int fd; int devid; - if (argc != 1) { - fprintf(stderr, "usage: %s\n", argv[0]); - exit(-1); - } + drmtest_subtest_init(argc, argv); fd = drm_open_any(); devid = intel_get_drm_devid(fd); @@ -158,32 +155,39 @@ int main(int argc, char **argv) exit(-1); } - fprintf(stderr, "running dummy loop on render\n"); - dummy_reloc_loop(I915_EXEC_RENDER); - fprintf(stderr, "dummy loop run on render completed\n"); - - if (!HAS_BSD_RING(devid)) - goto skip; - - sleep(2); - fprintf(stderr, "running dummy loop on bsd\n"); - dummy_reloc_loop(I915_EXEC_BSD); - fprintf(stderr, "dummy loop run on bsd completed\n"); + if (drmtest_run_subtest("render")) { + printf("running dummy loop on render\n"); + dummy_reloc_loop(I915_EXEC_RENDER); + printf("dummy loop run on render completed\n"); + } - if (!HAS_BLT_RING(devid)) - goto skip; + if (drmtest_run_subtest("bsd")) { + if (HAS_BSD_RING(devid)) { + sleep(2); + printf("running dummy loop on bsd\n"); + dummy_reloc_loop(I915_EXEC_BSD); + printf("dummy loop run on bsd completed\n"); + } + } - sleep(2); - fprintf(stderr, "running dummy loop on blt\n"); - dummy_reloc_loop(I915_EXEC_BLT); - fprintf(stderr, "dummy loop run on blt completed\n"); + if (drmtest_run_subtest("blt")) { + if (HAS_BLT_RING(devid)) { + sleep(2); + printf("running dummy loop on blt\n"); + dummy_reloc_loop(I915_EXEC_BLT); + printf("dummy loop run on blt completed\n"); + } + } - sleep(2); - fprintf(stderr, "running dummy loop on random rings\n"); - dummy_reloc_loop_random_ring(); - fprintf(stderr, "dummy loop run on random rings completed\n"); + if (drmtest_run_subtest("mixed")) { + if (HAS_BLT_RING(devid) && HAS_BSD_RING(devid)) { + sleep(2); + printf("running dummy loop on random rings\n"); + dummy_reloc_loop_random_ring(); + printf("dummy loop run on random rings completed\n"); + } + } -skip: drm_intel_bo_unreference(target_buffer); intel_batchbuffer_free(batch); drm_intel_bufmgr_destroy(bufmgr); -- cgit v1.2.3