From patchwork Fri May 15 10:24:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Morton X-Patchwork-Id: 6413421 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 81779C0432 for ; Fri, 15 May 2015 10:25:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9E0F52038C for ; Fri, 15 May 2015 10:25:20 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3577120386 for ; Fri, 15 May 2015 10:25:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 937486E20D; Fri, 15 May 2015 03:25:18 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 099B26E20D for ; Fri, 15 May 2015 03:25:18 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 15 May 2015 03:25:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,433,1427785200"; d="scan'208";a="710634778" Received: from djmorton-linux.isw.intel.com ([10.102.226.153]) by fmsmga001.fm.intel.com with ESMTP; 15 May 2015 03:25:16 -0700 From: Derek Morton To: intel-gfx@lists.freedesktop.org Date: Fri, 15 May 2015 11:24:55 +0100 Message-Id: <1431685495-20962-1-git-send-email-derek.j.morton@intel.com> X-Mailer: git-send-email 1.9.1 Cc: thomas.wood@intel.com Subject: [Intel-gfx] [PATCH i-g-t] tests/Android.mk: Treat all KMS tests as Cairo dependent X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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