summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-12-05 04:16:38 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-12-05 07:54:08 +0100
commitad5919617cbccd2f7a2c8311c8ebe83e6d0acd52 (patch)
treea23c82b3810d40708b051eaa03b7220bbea7d6af
parentd9d9578f3bd25734e8dc85b620c9c9073161d7fb (diff)
tests: fixup gem_exec_nop subtests
Note to self: No more pushing after 12 o'clock midnight. Not a good idea, too embarassing.
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/gem_exec_nop.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 18f7148..4658fce 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,6 +18,7 @@ TESTS_progs_M = \
gem_cpu_concurrent_blit \
gem_cs_tlb \
gem_exec_bad_domains \
+ gem_exec_nop \
gem_flink \
gem_gtt_concurrent_blit \
gem_mmap_gtt \
@@ -32,7 +33,6 @@ TESTS_progs = \
getversion \
getclient \
getstats \
- gem_exec_nop \
gem_exec_big \
gem_exec_blt \
gem_exec_faulting_reloc \
diff --git a/tests/gem_exec_nop.c b/tests/gem_exec_nop.c
index e45f10d..70dfe96 100644
--- a/tests/gem_exec_nop.c
+++ b/tests/gem_exec_nop.c
@@ -73,7 +73,7 @@ static int exec(int fd, uint32_t handle, int loops, unsigned ring_id)
execbuf.num_cliprects = 0;
execbuf.DR1 = 0;
execbuf.DR4 = 0;
- execbuf.flags = 0;
+ execbuf.flags = ring_id;
i915_execbuffer2_set_context_id(execbuf, 0);
execbuf.rsvd2 = 0;
@@ -111,6 +111,8 @@ int main(int argc, char **argv)
uint32_t devid;
int fd;
+ drmtest_subtest_init(argc, argv);
+
fd = drm_open_any();
devid = intel_get_drm_devid(fd);