summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Morton <derek.j.morton@intel.com>2015-05-15 11:24:55 +0100
committerDamien Lespiau <damien.lespiau@intel.com>2015-05-15 14:02:32 +0100
commitd819b7ee358de3972ee453221a4c2c99decb5c32 (patch)
tree0376e1674b1325206303640d4c7b7d053397cbd9
parentfa4396d0917aae72633cc4d0c8e14222ec494c84 (diff)
tests/Android.mk: Treat all KMS tests as Cairo dependent
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> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
-rw-r--r--tests/Android.mk36
1 files changed, 11 insertions, 25 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index fac99319..10ef3e22 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