test: Fix srcdir != objdir build and test failures

filecomp would fail because it couldn't find the input files, after
compilation failed due to missing includes.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

diff --git a/test/Makefile.am b/test/Makefile.am
index 386f3ea..bf5855c 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
 AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS)
 
 TESTS_ENVIRONMENT = $(SHELL)

diff --git a/test/filecomp.sh b/test/filecomp.sh
index 1418205..6f7fc36 100755 (executable)
--- a/test/filecomp.sh
+++ b/test/filecomp.sh
@@ -23,12 +23,12 @@ failcompile()
 
 rm -f "$log"
 
-compile basic.xkb
-compile named.xkb
-compile named.xkb de
-compile named.xkb us
-compile default.xkb
+compile $srcdir/basic.xkb
+compile $srcdir/named.xkb
+compile $srcdir/named.xkb de
+compile $srcdir/named.xkb us
+compile $srcdir/default.xkb
 
-failcompile basic.xkb foo
-failcompile named.xkb foo
-failcompile bad.xkb
+failcompile $srcdir/basic.xkb foo
+failcompile $srcdir/named.xkb foo
+failcompile $srcdir/bad.xkb