tests/gem_ctx_bad_exec: convert to subtests

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 25f4c6b..f07b547 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,6 +20,7 @@ TESTS_progs_M = \
        gem_caching \
        gem_cpu_concurrent_blit \
        gem_cs_tlb \
+       gem_ctx_bad_exec \
        gem_dummy_reloc_loop \
        gem_exec_bad_domains \
        gem_exec_nop \
@@ -57,7 +58,6 @@ TESTS_progs = \
        gem_cpu_reloc \
        gem_cs_prefetch \
        gem_ctx_bad_destroy \
-       gem_ctx_bad_exec \
        gem_ctx_basic \
        gem_ctx_create \
        gem_ctx_exec \

diff --git a/tests/gem_ctx_bad_exec.c b/tests/gem_ctx_bad_exec.c
index adb4981..22a3b8a 100644 (file)
--- a/tests/gem_ctx_bad_exec.c
+++ b/tests/gem_ctx_bad_exec.c
@@ -111,6 +111,7 @@ int main(int argc, char *argv[])
        int fd;
 
        igt_skip_on_simulation();
+       igt_subtest_init(argc, argv);
 
        fd = drm_open_any();
 
@@ -118,9 +119,12 @@ int main(int argc, char *argv[])
 
        handle = gem_create(fd, 4096);
        gem_write(fd, handle, 0, batch, sizeof(batch));
-       igt_assert(exec(fd, handle, I915_EXEC_RENDER, ctx_id) == 0);
-       igt_assert(exec(fd, handle, I915_EXEC_BSD, ctx_id) != 0);
-       igt_assert(exec(fd, handle, I915_EXEC_BLT, ctx_id) != 0);
+       igt_subtest("render")
+               igt_assert(exec(fd, handle, I915_EXEC_RENDER, ctx_id) == 0);
+       igt_subtest("bsd")
+               igt_assert(exec(fd, handle, I915_EXEC_BSD, ctx_id) != 0);
+       igt_subtest("blt")
+               igt_assert(exec(fd, handle, I915_EXEC_BLT, ctx_id) != 0);
 
        exit(EXIT_SUCCESS);
 }