From b556c9e8e5f53874da902c0c54442ef3eb56353e Mon Sep 17 00:00:00 2001 From: Shuang He Date: Tue, 19 Apr 2011 04:16:06 +0800 Subject: [PATCH] tests: Fix duplicate 'kms_flip_event_leak' entry in tests/Makefile.sources Or, it will cause piglit failure to run I-G-T test case Signed-off-by: Shuang He Signed-off-by: Daniel Vetter --- tests/Makefile.sources | 1 - tests/drv_getparams.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 4bf11bf9..aff84de8 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -64,7 +64,6 @@ TESTS_progs_M = \ kms_flip \ kms_flip_event_leak \ kms_flip_tiling \ - kms_flip_event_leak \ kms_mmio_vs_cs_flip \ kms_pipe_b_c_ivb \ kms_pipe_crc_basic \ diff --git a/tests/drv_getparams.c b/tests/drv_getparams.c index 1861fb8c..31382e9f 100644 --- a/tests/drv_getparams.c +++ b/tests/drv_getparams.c @@ -77,7 +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"); + igt_skip_on_f(ret == -EINVAL && intel_gen(devid), "Interface not supported by kernel\n"); if (ret) { /* @@ -92,7 +92,7 @@ subslice_total(void) /* * All other devices must implement the interface, so * fail them if we are here. - */ + */ } else { igt_assert_eq(ret, 0); }