vala r2166 - in trunk: . tests

[juergbi svn gnome org]

Author: juergbi
Date: Mon Dec 15 21:38:22 2008
New Revision: 2166
URL: http://svn.gnome.org/viewvc/vala?rev=2166&view=rev

Log:
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


Modified:
   trunk/ChangeLog
   trunk/THANKS
   trunk/tests/testrunner.sh

Modified: trunk/THANKS
==============================================================================
--- trunk/THANKS	(original)
+++ trunk/THANKS	Mon Dec 15 21:38:22 2008
@@ -30,6 +30,7 @@
 Frederik
 Gabriel FalcÃo
 Geert Jan Alsem
+GÃtz Waschk
 Hans Vercammen
 Jaap A. Haitsma
 Jamie McCracken

Modified: trunk/tests/testrunner.sh
==============================================================================
--- trunk/tests/testrunner.sh	(original)
+++ trunk/tests/testrunner.sh	Mon Dec 15 21:38:22 2008
@@ -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 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