[Mesa-dev] [PATCH] tests: Fix make check for out of tree builds.

[Jon TURNEY]

On 11/11/2013 22:06, Matt Turner wrote:
> On Mon, Nov 11, 2013 at 12:18 PM, Rico Schüller <kgbricola at web.de> wrote:
>> Signed-off-by: Rico Schüller <kgbricola at web.de>
>> ---
>>  src/mapi/shared-glapi/tests/Makefile.am | 1 +
>>  src/mesa/main/tests/Makefile.am         | 1 +
>>  2 Dateien geändert, 2 Zeilen hinzugefügt(+)
>>
>> diff --git a/src/mapi/shared-glapi/tests/Makefile.am b/src/mapi/shared-glapi/tests/Makefile.am
>> index 98065fc..7e71b4f 100644
>> --- a/src/mapi/shared-glapi/tests/Makefile.am
>> +++ b/src/mapi/shared-glapi/tests/Makefile.am
>> @@ -3,6 +3,7 @@ AM_CFLAGS = $(PTHREAD_CFLAGS)
>>  AM_CPPFLAGS = \
>>         -I$(top_srcdir)/src/gtest/include \
>>         -I$(top_srcdir)/src/mapi \
>> +       -I$(top_builddir)/src/mapi \
>>         -I$(top_srcdir)/include
>>
>>  TESTS = shared-glapi-test
> 
> Thanks! Reviewed-by and committed.

It seems that 'make check' for unshared glapi needs a similar fix.  Patch
attached.


-------------- next part --------------
>From 76130730ad77db1225190d1afa0ec2a07a055d58 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Fri, 8 Nov 2013 13:22:54 +0000
Subject: [PATCH 2/4] Fix 'make check' in src/mapi/glapi/tests when builddir !=
 srcdir

make[5]: Entering directory `/jhbuild/build/mesa/mesa/src/mapi/glapi/tests'
  CXX      check_table.o
/jhbuild/checkout/mesa/mesa/src/mapi/glapi/tests/check_table.cpp:29:30: fatal error: glapi/glapitable.h: No such file or directory

We should look for the generated file glapi/glapitable.h in builddir, not srcdir

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 src/mapi/glapi/tests/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mapi/glapi/tests/Makefile.am b/src/mapi/glapi/tests/Makefile.am
index 26149c9..da1094b 100644
--- a/src/mapi/glapi/tests/Makefile.am
+++ b/src/mapi/glapi/tests/Makefile.am
@@ -3,6 +3,7 @@ AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS = \
 	$(DEFINES) \
 	-I$(top_srcdir)/src/gtest/include \
+	-I$(top_builddir)/src/mapi \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/include
 
-- 
1.8.3.4