From mboxrd@z Thu Jan 1 00:00:00 1970 From: tim.gore@intel.com Subject: [PATCH] intel-gpu-tools: remove testdisplay.h from kms_render.c Date: Tue, 3 Jun 2014 15:18:31 +0100 Message-ID: <1401805111-31965-1-git-send-email-tim.gore@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D0696E3C0 for ; Tue, 3 Jun 2014 07:18:34 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org From: Tim Gore kms_render.c included testdisplay.h but did not need it. This was preventing it from building on Android due to the lack of a Glib port. So I have removed this #include and changed Android.mk so that kms_render is built if we have cairo. Signed-off-by: Tim Gore --- tests/Android.mk | 4 ++-- tests/kms_render.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/Android.mk b/tests/Android.mk index 6e9dc67..3fd32f5 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -31,7 +31,6 @@ skip_tests_list := skip_tests_list += gem_seqno_wrap skip_tests_list += testdisplay # needs glib.h skip_tests_list += pm_rpm -skip_tests_list += kms_render # needs glib.h # set local compilation flags for IGT tests IGT_LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM -DANDROID -UNDEBUG @@ -69,7 +68,8 @@ else gem_render_copy \ pm_lpsp \ kms_fence_pin_leak \ - kms_mmio_vs_cs_flip + kms_mmio_vs_cs_flip \ + kms_render IGT_LOCAL_CFLAGS += -DANDROID_HAS_CAIRO=0 endif diff --git a/tests/kms_render.c b/tests/kms_render.c index d9c0a58..6c742e2 100644 --- a/tests/kms_render.c +++ b/tests/kms_render.c @@ -31,7 +31,6 @@ #include #include "drmtest.h" -#include "testdisplay.h" #include "intel_bufmgr.h" #include "intel_batchbuffer.h" #include "intel_io.h" -- 1.9.2