From b486e3aba5c7618b7f6311e82b5fdb2c93f2beab Mon Sep 17 00:00:00 2001
From: Dylan Noblesmith <nobled@dreamwidth.org>
Date: Fri, 15 Jun 2012 22:44:28 +0000
Subject: [PATCH] tests: fix make check for out-of-tree builds

It was failing with missing include files.

While here, destroy the ugly "../src/..." include
paths used in the tests that was just hacking around
this problem in the Makefile:

sed -i s/..\\/src\\/// tests/*.c
---
 tests/Makefile.am        | 3 ++-
 tests/array-test.c       | 2 +-
 tests/client-test.c      | 2 +-
 tests/connection-test.c  | 2 +-
 tests/event-loop-test.c  | 2 +-
 tests/fixed-benchmark.c  | 2 +-
 tests/fixed-test.c       | 2 +-
 tests/list-test.c        | 2 +-
 tests/map-test.c         | 2 +-
 tests/os-wrappers-test.c | 4 ++--
 tests/sanity-test.c      | 2 +-
 11 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7ca3f40..fc4611c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,7 +34,8 @@ os_wrappers_test_SOURCES = 			\
 	../src/wayland-os.c			\
 	$(test_runner_src)
 
-AM_CFLAGS = $(GCC_CFLAGS) $(FFI_CFLAGS) -I../src
+AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
+AM_CFLAGS = $(GCC_CFLAGS) $(FFI_CFLAGS)
 LDADD = $(top_builddir)/src/libwayland-util.la \
 	$(top_builddir)/src/libwayland-server.la \
 	-lrt -ldl $(FFI_LIBS)
diff --git a/tests/array-test.c b/tests/array-test.c
index 0269e3e..7639878 100644
--- a/tests/array-test.c
+++ b/tests/array-test.c
@@ -22,7 +22,7 @@
 
 #include <stdlib.h>
 #include <assert.h>
-#include "../src/wayland-private.h"
+#include "wayland-private.h"
 #include "test-runner.h"
 
 TEST(array_init)
diff --git a/tests/client-test.c b/tests/client-test.c
index dd2190f..5521510 100644
--- a/tests/client-test.c
+++ b/tests/client-test.c
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "../src/wayland-server.h"
+#include "wayland-server.h"
 #include "test-runner.h"
 
 struct client_destroy_listener {
diff --git a/tests/connection-test.c b/tests/connection-test.c
index f2116cb..066b4bc 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -32,7 +32,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "../src/wayland-private.h"
+#include "wayland-private.h"
 #include "test-runner.h"
 
 static const char message[] = "Hello, world";
diff --git a/tests/event-loop-test.c b/tests/event-loop-test.c
index 01d92d6..e630cde 100644
--- a/tests/event-loop-test.c
+++ b/tests/event-loop-test.c
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <unistd.h>
 #include <signal.h>
-#include "../src/wayland-server.h"
+#include "wayland-server.h"
 #include "test-runner.h"
 
 static int
diff --git a/tests/fixed-benchmark.c b/tests/fixed-benchmark.c
index 0d7abd0..0719063 100644
--- a/tests/fixed-benchmark.c
+++ b/tests/fixed-benchmark.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <time.h>
 #include <assert.h>
-#include "../src/wayland-private.h"
+#include "wayland-private.h"
 
 volatile double global_d;
 
diff --git a/tests/fixed-test.c b/tests/fixed-test.c
index 16fa5ff..739a3b1 100644
--- a/tests/fixed-test.c
+++ b/tests/fixed-test.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
-#include "../src/wayland-private.h"
+#include "wayland-private.h"
 #include "test-runner.h"
 
 TEST(fixed_double_conversions)
diff --git a/tests/list-test.c b/tests/list-test.c
index 06d0b29..6058fe3 100644
--- a/tests/list-test.c
+++ b/tests/list-test.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "../src/wayland-private.h"
+#include "wayland-private.h"
 #include "test-runner.h"
 
 TEST(list_init)
diff --git a/tests/map-test.c b/tests/map-test.c
index 00de337..28a48c2 100644
--- a/tests/map-test.c
+++ b/tests/map-test.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "../src/wayland-private.h"
+#include "wayland-private.h"
 #include "test-runner.h"
 
 TEST(map_insert_new)
diff --git a/tests/os-wrappers-test.c b/tests/os-wrappers-test.c
index 0b38a35..b9be2b4 100644
--- a/tests/os-wrappers-test.c
+++ b/tests/os-wrappers-test.c
@@ -36,9 +36,9 @@
 #include <stdio.h>
 #include <sys/epoll.h>
 
-#include "../src/wayland-private.h"
+#include "wayland-private.h"
 #include "test-runner.h"
-#include "../src/wayland-os.h"
+#include "wayland-os.h"
 
 static int fall_back;
 
diff --git a/tests/sanity-test.c b/tests/sanity-test.c
index 4e6f281..67ca663 100644
--- a/tests/sanity-test.c
+++ b/tests/sanity-test.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 #include "test-runner.h"
-#include "../src/wayland-util.h"
+#include "wayland-util.h"
 
 TEST(empty)
 {
-- 
2.7.4