diff options
| author | Shuang He <shuang.he@intel.com> | 2011-04-19 04:16:06 +0800 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-04-09 10:12:33 +0200 |
| commit | b556c9e8e5f53874da902c0c54442ef3eb56353e (patch) | |
| tree | b3977464dcc412075216437e444eb2dc80fa9599 /tests | |
| parent | 1f6a64ee8078ac32c2986ee9f043c55ce6f22542 (diff) | |
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 <shuang.he@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.sources | 1 | ||||
| -rw-r--r-- | 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); } |