tests: use drmtest_skip() in caching ioctl helpers

This way we can rip out all the skip handling from the test control flow,
and additionally (by using drmtest_retval()) even get correct exit codes.

The only tricky part is that when we only want ot skip parts of a test
(like for gem_pread and gem_pwrite) we need to split out those parts as
subtests. But no addition of control-flow is required, the set/longjmp
magic in the helpers all makes it happen.

Also we make extensive use of the behaviour of drmtest_skip to skip
all subsequent subtests if it is called outside of a subtest. This allows
us to re-flatten the control flow a lot.

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

1 files changed, 14 insertions, 6 deletions

diff --git a/lib/drmtest.c b/lib/drmtest.c
index 77e8002e..7e3c1d81 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -40,6 +40,7 @@
 #include <stdlib.h>
 #include <linux/kd.h>
 #include <unistd.h>
+#include <sys/wait.h>
 #include "drm_fourcc.h"
 
 #include "drmtest.h"
@@ -392,23 +393,26 @@ struct local_drm_i915_gem_caching {
 #define LOCAL_DRM_IOCTL_I915_GEM_GET_CACHEING \
 	DRM_IOWR(DRM_COMMAND_BASE + LOCAL_DRM_I915_GEM_GET_CACHEING, struct local_drm_i915_gem_caching)
 
-int gem_has_caching(int fd)
+void gem_check_caching(int fd)
 {
 	struct local_drm_i915_gem_caching arg;
 	int ret;
 
 	arg.handle = gem_create(fd, 4096);
-	if (arg.handle == 0)
-		return 0;
+	assert(arg.handle != 0);
 
 	arg.caching = 0;
 	ret = ioctl(fd, LOCAL_DRM_IOCTL_I915_GEM_SET_CACHEING, &arg);
 	gem_close(fd, arg.handle);
 
-	return ret == 0;
+	if (ret != 0) {
+		if (!drmtest_only_list_subtests())
+			printf("no set_caching support detected\n");
+		drmtest_skip();
+	}
 }
 
-int gem_set_caching(int fd, uint32_t handle, int caching)
+void gem_set_caching(int fd, uint32_t handle, int caching)
 {
 	struct local_drm_i915_gem_caching arg;
 	int ret;
@@ -416,7 +420,11 @@ int gem_set_caching(int fd, uint32_t handle, int caching)
 	arg.handle = handle;
 	arg.caching = caching;
 	ret = ioctl(fd, LOCAL_DRM_IOCTL_I915_GEM_SET_CACHEING, &arg);
-	return ret == 0 ? 0 : -errno;
+
+	if (ret != 0 && (errno == ENOTTY || errno == EINVAL))
+		drmtest_skip();
+	else
+		assert(ret == 0);
 }
 
 uint32_t gem_get_caching(int fd, uint32_t handle)