diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-29 14:42:33 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-29 15:33:07 +0200 |
| commit | e4753d2d96fbb88077e70820793137f45f02c9ba (patch) | |
| tree | f30c0e4c57a83e9a78911aa4747abb2bb500310d | |
| parent | 5da8b8db02df768ba560e7522f69106246a0590c (diff) | |
tests/gem_wait_render_timeout: Convert to subtests
I want to add a bunch of api tests besides the functional
"render-timeout" testcase.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
| -rw-r--r-- | tests/.gitignore | 2 | ||||
| -rw-r--r-- | tests/Makefile.sources | 2 | ||||
| -rw-r--r-- | tests/gem_wait.c (renamed from tests/gem_wait_render_timeout.c) | 21 |
3 files changed, 19 insertions, 6 deletions
diff --git a/tests/.gitignore b/tests/.gitignore index c6a99bed..bb90685b 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -104,7 +104,7 @@ gem_tiling_max_stride gem_unfence_active_buffers gem_unref_active_buffers gem_userptr_blits -gem_wait_render_timeout +gem_wait gem_write_read_ring_switch gem_workarounds gen3_mixed_blits diff --git a/tests/Makefile.sources b/tests/Makefile.sources index d18d7b58..5202ab26 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -136,7 +136,7 @@ TESTS_progs = \ gem_tiling_max_stride \ gem_unfence_active_buffers \ gem_unref_active_buffers \ - gem_wait_render_timeout \ + gem_wait \ gem_workarounds \ gen3_mixed_blits \ gen3_render_linear_blits \ diff --git a/tests/gem_wait_render_timeout.c b/tests/gem_wait.c index 86640faf..0a8ccf62 100644 --- a/tests/gem_wait_render_timeout.c +++ b/tests/gem_wait.c @@ -106,12 +106,12 @@ static void blt_color_fill(struct intel_batchbuffer *batch, ADVANCE_BATCH(); } -igt_simple_main +static void render_timeout(int fd) { drm_intel_bufmgr *bufmgr; struct intel_batchbuffer *batch; uint64_t timeout = ENOUGH_WORK_IN_SECONDS * NSEC_PER_SEC; - int fd, ret; + int ret; const bool do_signals = true; /* signals will seem to make the operation * use less process CPU time */ bool done = false; @@ -119,8 +119,6 @@ igt_simple_main igt_skip_on_simulation(); - fd = drm_open_any(); - bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); drm_intel_bufmgr_gem_enable_reuse(bufmgr); batch = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd)); @@ -217,3 +215,18 @@ igt_simple_main close(fd); } + +int drm_fd; + +igt_main +{ + igt_fixture + drm_fd = drm_open_any(); + + igt_subtest("render_timeout") + render_timeout(drm_fd); + + + igt_fixture + close(drm_fd); +} |