[i-g-t] tests/Android.mk: Treat all KMS tests as Cairo dependent
diff mbox

Message ID 1431685495-20962-1-git-send-email-derek.j.morton@intel.com
State New
Headers show

Commit Message

Derek Morton May 15, 2015, 10:24 a.m. UTC
If ANDROID_HAS_CAIRO is not set, automatically add all
kms tests to the skip_tests_list.

Building for android currently fails due to the addition of
new kms tests. Rather than just adding the new tests to the
exclusion list, autogenerating a list of all kms tests and
excluding them will reduce future maintainance.

Signed-off-by: Derek Morton <derek.j.morton@intel.com>
---
 tests/Android.mk | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

Comments

Lespiau, Damien May 15, 2015, 10:53 a.m. UTC | #1
On Fri, May 15, 2015 at 11:24:55AM +0100, Derek Morton wrote:
> If ANDROID_HAS_CAIRO is not set, automatically add all
> kms tests to the skip_tests_list.
> 
> Building for android currently fails due to the addition of
> new kms tests. Rather than just adding the new tests to the
> exclusion list, autogenerating a list of all kms tests and
> excluding them will reduce future maintainance.
> 
> Signed-off-by: Derek Morton <derek.j.morton@intel.com>

I can see a small flaw here: we don't run any i-g-t display test on
Android, that sounds like a really bad idea? cross-compiling cairo isn't
hard, what about adding cairo to the test builds?

Or are happy with not running any i-g-t display test? having coverage
elsewhere?
Derek Morton May 15, 2015, 11:15 a.m. UTC | #2
>On Fri, May 15, 2015 at 11:24:55AM +0100, Derek Morton wrote:
>> If ANDROID_HAS_CAIRO is not set, automatically add all kms tests to 
>> the skip_tests_list.
>> 
>> Building for android currently fails due to the addition of new kms 
>> tests. Rather than just adding the new tests to the exclusion list, 
>> autogenerating a list of all kms tests and excluding them will reduce 
>> future maintainance.
>> 
>> Signed-off-by: Derek Morton <derek.j.morton@intel.com>

>I can see a small flaw here: we don't run any i-g-t display test on Android, that sounds like a really bad idea? cross-compiling cairo >isn't hard, what about adding cairo to the test builds?

>Or are happy with not running any i-g-t display test? having coverage elsewhere?

>--
>Damien

There is a flag ANDROID_HAS_CAIRO in the build system. This change only affects when the flag is not set. The kms tests were not being included if the flag was not set. This change just removes the need to manually maintain the exclude list whenever a new kms test is added.

//Derek
Lespiau, Damien May 15, 2015, 1:06 p.m. UTC | #3
On Fri, May 15, 2015 at 12:15:36PM +0100, Morton, Derek J wrote:
> 
> >On Fri, May 15, 2015 at 11:24:55AM +0100, Derek Morton wrote:
> >> If ANDROID_HAS_CAIRO is not set, automatically add all kms tests to 
> >> the skip_tests_list.
> >> 
> >> Building for android currently fails due to the addition of new kms 
> >> tests. Rather than just adding the new tests to the exclusion list, 
> >> autogenerating a list of all kms tests and excluding them will reduce 
> >> future maintainance.
> >> 
> >> Signed-off-by: Derek Morton <derek.j.morton@intel.com>
> 
> >I can see a small flaw here: we don't run any i-g-t display test on
> >Android, that sounds like a really bad idea? cross-compiling cairo
> >>isn't hard, what about adding cairo to the test builds?
> 
> >Or are happy with not running any i-g-t display test? having coverage
> >elsewhere?
> 
> There is a flag ANDROID_HAS_CAIRO in the build system. This change
> only affects when the flag is not set. The kms tests were not being
> included if the flag was not set. This change just removes the need to
> manually maintain the exclude list whenever a new kms test is added.

Oh, I forgot about ANDROID_HAS_CAIRO. Pushed then, thanks for the patch.

Patch
diff mbox

diff --git a/tests/Android.mk b/tests/Android.mk
index fac9931..10ef3e2 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -55,32 +55,18 @@  ifeq ("${ANDROID_HAS_CAIRO}", "1")
 else
 # the following tests depend on cairo, so skip them
     skip_tests_list += \
-    kms_3d \
-    kms_plane \
-    kms_addfb \
-    kms_cursor_crc \
-    kms_flip \
-    kms_flip_tiling \
-    kms_pipe_crc_basic \
-    kms_psr_sink_crc \
-    kms_fbc_crc \
-    kms_setmode \
-    kms_sink_crc_basic \
     gem_render_copy \
-    pm_lpsp \
-    kms_fence_pin_leak \
-    kms_mmio_vs_cs_flip \
-    kms_render \
-    kms_universal_plane \
-    kms_rotation_crc \
-    kms_force_connector \
-    kms_flip_event_leak \
-    kms_crtc_background_color \
-    kms_plane_scaling \
-    kms_panel_fitting \
-    kms_pwrite_crc \
-    kms_pipe_b_c_ivb \
-    kms_legacy_colorkey
+    pm_lpsp
+
+# All kms tests depend on cairo
+    tmp_list := $(foreach test_name, $(TESTS_progs),\
+        $(if $(findstring kms_,$(test_name)),$(test_name)))
+    skip_tests_list += $(tmp_list)
+
+    tmp_list := $(foreach test_name, $(TESTS_progs_M),\
+        $(if $(findstring kms_,$(test_name)),$(test_name)))
+    skip_tests_list += $(tmp_list)
+
     IGT_LOCAL_CFLAGS += -DANDROID_HAS_CAIRO=0
 endif