summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJeff McGee <jeff.mcgee@intel.com>2015-03-24 11:30:57 -0700
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-03-25 14:41:52 +0100
commit301b9e4bb389a968cfae79a1bea07834436165b8 (patch)
treeaad18775cf48535142d550502c91ef6dba578b8e /tests
parent9ba93c43cfb19c5a82a1d6f20f2d3140c8ca80bf (diff)
tests/drv_getparams: Skip instead of fail on EINVAL
Avoid failing on older kernels where the GETPARAM interfaces don't exist. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89669 Signed-off-by: Jeff McGee <jeff.mcgee@intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/drv_getparams.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/drv_getparams.c b/tests/drv_getparams.c
index f3836629..1861fb8c 100644
--- a/tests/drv_getparams.c
+++ b/tests/drv_getparams.c
@@ -77,6 +77,7 @@ subslice_total(void)
int ret;
ret = getparam(LOCAL_I915_PARAM_SUBSLICE_TOTAL, (int*)&subslice_total);
+ igt_skip_on_f(ret == -EINVAL, "Interface not supported by kernel\n");
if (ret) {
/*
@@ -93,9 +94,7 @@ subslice_total(void)
* fail them if we are here.
*/
} else {
- igt_assert_neq(ret, EINVAL); /* request not recognized? */
- igt_assert_neq(ret, ENODEV); /* device not supported? */
- igt_assert_eq(ret, 0); /* other error? */
+ igt_assert_eq(ret, 0);
}
} else {
/*
@@ -115,6 +114,7 @@ eu_total(void)
int ret;
ret = getparam(LOCAL_I915_PARAM_EU_TOTAL, (int*)&eu_total);
+ igt_skip_on_f(ret == -EINVAL, "Interface not supported by kernel\n");
if (ret) {
/*
@@ -131,9 +131,7 @@ eu_total(void)
* fail them if we are here.
*/
} else {
- igt_assert_neq(ret, EINVAL); /* request not recognized? */
- igt_assert_neq(ret, ENODEV); /* device not supported? */
- igt_assert_eq(ret, 0); /* other error? */
+ igt_assert_eq(ret, 0);
}
} else {
/*