tests/Android.mk: Treat all KMS tests as Cairo dependent
PATCH 1/1 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.
--- tests/Android.mk | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-)
tests/Android.mk +11 -25
@@ -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
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Derek Morton
If
ANDROID_HAS_CAIROis not set, automatically add all kms tests to theskip_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 <[email protected]>
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?
Signature · 5 lines
Damien _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Derek Morton
Quoted 8 lines
If
ANDROID_HAS_CAIROis not set, automatically add all kms tests to theskip_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.
Quoted 8 lines
Quoted 1 line
Signed-off-by Derek Morton <[email protected]>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
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 16 lines · Derek J
Quoted 15 lines · Derek Morton
Quoted 9 lines
If
ANDROID_HAS_CAIROis not set, automatically add all kms tests to theskip_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 <[email protected]>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
Quoted 1 line
isn't hard, what about adding cairo to the test builds?
Quoted 7 lines
Quoted 2 lines
Or are happy with not running any i-g-t display test? having coverage elsewhere?
There is a flag
ANDROID_HAS_CAIROin 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.
Signature · 5 lines
Damien _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx