Fix make check of uninstalled vala, based on patch by Götz Waschk, fixes

2008-12-15  Jürg Billeter  <j@bitron.ch>

	* tests/testrunner.sh:

	Fix make check of uninstalled vala, based on patch by Götz Waschk,
	fixes bug 562951

svn path=/trunk/; revision=2166

diff --git a/ChangeLog b/ChangeLog
index 986928b4d5dd07563807bebd02132900de473525..d31bd7d448e9b54cec2f8593bc1c6215fc8f5af5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-15  Jürg Billeter  <j@bitron.ch>
+
+       * tests/testrunner.sh:
+
+       Fix make check of uninstalled vala, based on patch by Götz Waschk,
+       fixes bug 562951
+
 2008-12-15  Jürg Billeter  <j@bitron.ch>
 
        * tests/testrunner.sh:

diff --git a/THANKS b/THANKS
index 6a9c7ed00665790b73024ac8105d5f735341239a..1697a4af7dd18521a660dc2b23022b98de35d967 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -30,6 +30,7 @@ Francisco Camenforte Torres
 Frederik
 Gabriel Falcão
 Geert Jan Alsem
+Götz Waschk
 Hans Vercammen
 Jaap A. Haitsma
 Jamie McCracken

diff --git a/tests/testrunner.sh b/tests/testrunner.sh
index a965eee8f5d7da6e33123cb7bda7257cdbe7a5c2..00a624035080bab3a853d138c1c74811366063cb 100755 (executable)
--- a/tests/testrunner.sh
+++ b/tests/testrunner.sh
@@ -22,13 +22,14 @@
 
 builddir=$PWD
 topbuilddir=$builddir/..
-srcdir=`dirname $0`
+srcdir=$PWD/`dirname $0`
 topsrcdir=$srcdir/..
 vapidir=$topsrcdir/vapi
 
 export G_DEBUG=fatal_warnings
 
 VALAC=$topbuilddir/compiler/valac
+VALAFLAGS="--vapidir $vapidir"
 CC="gcc -std=c99"
 CFLAGS="-O0 -g3 -I$topsrcdir -I$topbuilddir"
 LDLIBS="-lm"
@@ -57,7 +58,7 @@ function sourceheader() {
 
 function sourceend() {
        if [ -n "$PROGRAM" ]; then
-               echo "$VALAC $(echo $PACKAGES | xargs -n 1 -r echo --pkg) -C $SOURCEFILE" >> build
+               echo "$VALAC $VALAFLAGS $(echo $PACKAGES | xargs -n 1 -r echo --pkg) -C $SOURCEFILE" >> build
                echo "$CC $CFLAGS -o $PROGRAM$EXEEXT $PROGRAM.c \$(pkg-config --cflags --libs glib-2.0 gobject-2.0 $PACKAGES) $LDLIBS" >> build
                echo "./$PROGRAM$EXEEXT" > check
        fi