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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxx>
---
 tests/Android.mk | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

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
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx





[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux