[Intel-gfx] intel-gpu-tools: --disable-tests option should make cairo-check obsolete

[Sedat Dilek]

On Wed, Aug 14, 2013 at 11:25 PM, Chris Wilson <chris at chris-wilson.co.uk> wrote:
> On Wed, Aug 14, 2013 at 11:14:05PM +0200, Sedat Dilek wrote:
>> On Wed, Aug 14, 2013 at 11:03 PM, Chris Wilson <chris at chris-wilson.co.uk> wrote:
>> > On Wed, Aug 14, 2013 at 10:33:42PM +0200, Sedat Dilek wrote:
>> >> Hi,
>> >>
>> >> I am here on Ubuntu/precise and wanted to avoid to upgrade to a higher
>> >> cairo-version.
>> >
>> > Daniel's position is that he wants to make it hard for QA to build the
>> > tests incorrectly and so skip half of them. I think defaulting to
>> > erroring out at configure if cairo is too old, but allowing an explicit
>> > --disable-cairo should make all us happy.
>>
>> Hmm, just curious how this should work?
>>
>> Beyond testdisplay... kms_flip and kms_render tests require cairo.h
>> include - not sure which version of cairo is minimum.
>> So, --disable-cairo configure-option should disable above tests?
>>
>> [ tests/Makefile.am ]
>> ...
>> testdisplay_SOURCES = \
>>         testdisplay.c \
>>         testdisplay.h \
>>         testdisplay_hotplug.c \
>>         $(NULL)
>>
>> TESTS_progs += testdisplay
>> LDADD += $(CAIRO_LIBS) $(LIBUDEV_LIBS) $(GLIB_LIBS)
>> AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS)
>> ...
>>
>> $ grep -i cairo.h -nr ./
>> ./lib/drmtest.h:34:#include <cairo.h>
>> ./tests/kms_flip.c:28:#include <cairo.h>
>> ./tests/kms_render.c:27:#include <cairo.h>
>> ./tests/testdisplay.c:52:#include <cairo.h>
>
> First you would need to split the cairo portion of drmtest.[ch] into its
> own files and then conditionally compile those, along with the cairo
> dependent tests.

As said I am not an autotools expert.

But I was interested in the tools not building the tests.
That's why I asked why I am forced to upgrade to a higher cairo release.

Why does tools require $(CAIRO_CFLAGS) and  $(CAIRO_LIBS)?
Hmm, looks like intel_perf_counters and intel_l3_parity do...

tools/Makefile.am:40:AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS)
$(CWARNFLAGS) $(CAIRO_CFLAGS)
tools/Makefile.am:41:LDADD = $(top_builddir)/lib/libintel_tools.la
$(DRM_LIBS) $(PCIACCESS_LIBS) $(CAIRO_LIBS)

tools/intel_perf_counters.c:47:#include "drmtest.h"
tools/intel_l3_parity.c:38:#include "drmtest.h"

--disable-cairo might be a good idea, but I cannot help here.

- Sedat -