tests/prime_nv_pcopy: convert to subtests

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3f13765..da3e8c4 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,10 +7,10 @@ noinst_PROGRAMS = \
 
 if HAVE_NOUVEAU
 NOUVEAU_TESTS_M = \
-       prime_nv_test
-NOUVEAU_TESTS = \
-       prime_nv_api  \
+       prime_nv_test \
        prime_nv_pcopy
+NOUVEAU_TESTS = \
+       prime_nv_api
 endif
 
 TESTS_progs_M = \

diff --git a/tests/prime_nv_pcopy.c b/tests/prime_nv_pcopy.c
index 7ed5cf4..dc16f7a 100644 (file)
--- a/tests/prime_nv_pcopy.c
+++ b/tests/prime_nv_pcopy.c
@@ -28,6 +28,7 @@
 #include "nouveau.h"
 #include "intel_gpu_tools.h"
 #include "intel_batchbuffer.h"
+#include "drmtest.h"
 
 static int intel_fd = -1, nouveau_fd = -1;
 static drm_intel_bufmgr *bufmgr;
@@ -1266,13 +1267,16 @@ int main(int argc, char **argv)
 {
        int ret, failed = 0, run = 0;
 
+       drmtest_subtest_init(argc, argv);
+
        ret = find_and_open_devices();
        if (ret < 0)
                return ret;
 
        if (nouveau_fd == -1 || intel_fd == -1) {
                fprintf(stderr,"failed to find intel and nouveau GPU\n");
-               return 77;
+               if (!drmtest_only_list_subtests())
+                       return 77;
        }
 
        /* set up intel bufmgr */
@@ -1292,6 +1296,7 @@ int main(int argc, char **argv)
        batch = intel_batchbuffer_alloc(bufmgr, devid);
 
 #define xtest(x, args...) do { \
+       if (!drmtest_run_subtest( #x )) break; \
        ret = ((x)(args)); \
        ++run; \
        if (ret) { \