From 3cca0d8c6d33837e1e5a3f1bd1210cb37bb94a18 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Wed, 28 Nov 2012 11:16:44 +0100 Subject: [PATCH] tests/gem_basic: convert to subtest infrastructure --- tests/Makefile.am | 2 +- tests/gem_basic.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 5f4d688..c882766 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,6 +13,7 @@ NOUVEAU_TESTS = \ endif TESTS_progs_M = \ + gem_basic \ flip_test \ $(NULL) @@ -20,7 +21,6 @@ TESTS_progs = \ getversion \ getclient \ getstats \ - gem_basic \ gem_cacheing \ gem_cpu_concurrent_blit \ gem_cs_tlb \ diff --git a/tests/gem_basic.c b/tests/gem_basic.c index 24ad445..5cc8684 100644 --- a/tests/gem_basic.c +++ b/tests/gem_basic.c @@ -80,11 +80,16 @@ int main(int argc, char **argv) { int fd; + drmtest_subtest_init(argc, argv); + fd = drm_open_any(); - test_bad_close(fd); - test_create_close(fd); - test_create_fd_close(fd); + if (drmtest_run_subtest("bad-close")) + test_bad_close(fd); + if (drmtest_run_subtest("create-close")) + test_create_close(fd); + if (drmtest_run_subtest("create-fd-close")) + test_create_fd_close(fd); return 0; } -- 2.7.4