diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-07-15 10:51:10 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-07-15 10:51:10 +0200 |
commit | c28b898cd48f389f5f830ae1fdbeeccbcef5a5af (patch) | |
tree | bfd84b12db6a359f971ce35821f2ac1c77424cf5 /tests | |
parent | b37d89318de5b5e771ad065bb7b55102f6800391 (diff) |
tests/prime_nv_api: convert to subtest infrastructure
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.am | 7 | ||||
-rw-r--r-- | tests/prime_nv_api.c | 58 |
2 files changed, 34 insertions, 31 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index c78f2d1f..3003aa01 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,9 +10,9 @@ noinst_PROGRAMS = \ if HAVE_NOUVEAU NOUVEAU_TESTS_M = \ prime_nv_test \ - prime_nv_pcopy -NOUVEAU_TESTS = \ - prime_nv_api + prime_nv_pcopy \ + prime_nv_api \ + $(NULL) endif TESTS_progs_M = \ @@ -105,7 +105,6 @@ TESTS_progs = \ gem_ctx_basic \ gem_reg_read \ gem_tiling_max_stride \ - $(NOUVEAU_TESTS) \ prime_udl \ $(NULL) diff --git a/tests/prime_nv_api.c b/tests/prime_nv_api.c index e1b7117f..1c1ecd1d 100644 --- a/tests/prime_nv_api.c +++ b/tests/prime_nv_api.c @@ -18,6 +18,7 @@ #include "nouveau.h" #include "intel_gpu_tools.h" #include "intel_batchbuffer.h" +#include "drmtest.h" #define BO_SIZE (256*1024) @@ -316,13 +317,16 @@ int main(int argc, char **argv) { int ret; + drmtest_subtest_init(argc, argv); + ret = find_and_open_devices(); if (ret < 0) return ret; if (nouveau_fd == -1 || intel_fd == -1 || nouveau_fd2 == -1 || intel_fd2 == -1) { fprintf(stderr,"failed to find intel and nouveau GPU\n"); - return 77; + if (!drmtest_only_list_subtests()) + return 77; } /* set up intel bufmgr */ @@ -341,7 +345,7 @@ int main(int argc, char **argv) ret = nouveau_device_wrap(nouveau_fd, 0, &ndev); if (ret < 0) { fprintf(stderr,"failed to wrap nouveau device\n"); - return 77; + return -1; } ret = nouveau_client_new(ndev, &nclient); @@ -354,7 +358,7 @@ int main(int argc, char **argv) ret = nouveau_device_wrap(nouveau_fd2, 0, &ndev2); if (ret < 0) { fprintf(stderr,"failed to wrap nouveau device\n"); - return 77; + return -1; } ret = nouveau_client_new(ndev2, &nclient2); @@ -367,37 +371,37 @@ int main(int argc, char **argv) devid = intel_get_drm_devid(intel_fd); intel_batch = intel_batchbuffer_alloc(bufmgr, devid); - ret = test1(); - if (ret) - fprintf(stderr,"prime_test: failed test 1\n"); + if (drmtest_run_subtest("test1")) + if (test1()) + exit(2); - ret = test2(); - if (ret) - fprintf(stderr,"prime_test: failed test 2\n"); + if (drmtest_run_subtest("test2")) + if (test2()) + exit(2); - ret = test3(); - if (ret) - fprintf(stderr,"prime_test: failed test 3\n"); + if (drmtest_run_subtest("test3")) + if (test3()) + exit(2); - ret = test4(); - if (ret) - fprintf(stderr,"prime_test: failed test 4\n"); + if (drmtest_run_subtest("test4")) + if (test4()) + exit(2); - ret = test5(); - if (ret) - fprintf(stderr,"prime_test: failed test 5\n"); + if (drmtest_run_subtest("test5")) + if (test5()) + exit(2); - ret = test6(); - if (ret) - fprintf(stderr,"prime_test: failed test 6\n"); + if (drmtest_run_subtest("test6")) + if (test6()) + exit(2); - ret = test7(); - if (ret) - fprintf(stderr,"prime_test: failed test 7\n"); + if (drmtest_run_subtest("test7")) + if (test7()) + exit(2); - ret = test8(); - if (ret) - fprintf(stderr,"prime_test: failed test 8\n"); + if (drmtest_run_subtest("test8")) + if (test8()) + exit(2); intel_batchbuffer_free(intel_batch); |