Commit b486e3ab authored by Dylan Noblesmith's avatar Dylan Noblesmith

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
parent c394b759
...@@ -34,7 +34,8 @@ os_wrappers_test_SOURCES = \ ...@@ -34,7 +34,8 @@ os_wrappers_test_SOURCES = \
../src/wayland-os.c \ ../src/wayland-os.c \
$(test_runner_src) $(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 \ LDADD = $(top_builddir)/src/libwayland-util.la \
$(top_builddir)/src/libwayland-server.la \ $(top_builddir)/src/libwayland-server.la \
-lrt -ldl $(FFI_LIBS) -lrt -ldl $(FFI_LIBS)
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include "../src/wayland-private.h" #include "wayland-private.h"
#include "test-runner.h" #include "test-runner.h"
TEST(array_init) TEST(array_init)
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "../src/wayland-server.h" #include "wayland-server.h"
#include "test-runner.h" #include "test-runner.h"
struct client_destroy_listener { struct client_destroy_listener {
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "../src/wayland-private.h" #include "wayland-private.h"
#include "test-runner.h" #include "test-runner.h"
static const char message[] = "Hello, world"; static const char message[] = "Hello, world";
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h> #include <signal.h>
#include "../src/wayland-server.h" #include "wayland-server.h"
#include "test-runner.h" #include "test-runner.h"
static int static int
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <assert.h> #include <assert.h>
#include "../src/wayland-private.h" #include "wayland-private.h"
volatile double global_d; volatile double global_d;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
#include "../src/wayland-private.h" #include "wayland-private.h"
#include "test-runner.h" #include "test-runner.h"
TEST(fixed_double_conversions) TEST(fixed_double_conversions)
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include "../src/wayland-private.h" #include "wayland-private.h"
#include "test-runner.h" #include "test-runner.h"
TEST(list_init) TEST(list_init)
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include "../src/wayland-private.h" #include "wayland-private.h"
#include "test-runner.h" #include "test-runner.h"
TEST(map_insert_new) TEST(map_insert_new)
......
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
#include <stdio.h> #include <stdio.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#include "../src/wayland-private.h" #include "wayland-private.h"
#include "test-runner.h" #include "test-runner.h"
#include "../src/wayland-os.h" #include "wayland-os.h"
static int fall_back; static int fall_back;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <unistd.h> #include <unistd.h>
#include "test-runner.h" #include "test-runner.h"
#include "../src/wayland-util.h" #include "wayland-util.h"
TEST(empty) TEST(empty)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment