testrunner: Respect given VALAFLAGS

https://bugzilla.gnome.org/show_bug.cgi?id=611223

diff --git a/tests/testrunner.sh b/tests/testrunner.sh
index 618fbf1d78c029c520d9abb771224e2d1086a580..c96655c71e787e0f370ff9b72cebc03ba8fab2f9 100755 (executable)
--- a/tests/testrunner.sh
+++ b/tests/testrunner.sh
@@ -29,7 +29,7 @@ vapidir=$topsrcdir/vapi
 export G_DEBUG=fatal_warnings
 
 VALAC=$topbuilddir/compiler/valac$EXEEXT
-VALAFLAGS="--vapidir $vapidir --disable-warnings --main main --save-temps -X -g -X -O0 -X -pipe -X -lm -X -DGETTEXT_PACKAGE=valac -X -Werror=return-type -X -Werror=init-self -X -Werror=implicit -X -Werror=sequence-point -X -Werror=return-type -X -Werror=uninitialized -X -Werror=pointer-arith -X -Werror=int-to-pointer-cast -X -Werror=pointer-to-int-cast -X -Wformat -X -Werror=format-security -X -Werror=format-nonliteral -X -Werror=redundant-decls -X -Werror=int-conversion"
+VALAFLAGS="$VALAFLAGS --vapidir $vapidir --disable-warnings --main main --save-temps -X -g -X -O0 -X -pipe -X -lm -X -DGETTEXT_PACKAGE=valac -X -Werror=return-type -X -Werror=init-self -X -Werror=implicit -X -Werror=sequence-point -X -Werror=return-type -X -Werror=uninitialized -X -Werror=pointer-arith -X -Werror=int-to-pointer-cast -X -Werror=pointer-to-int-cast -X -Wformat -X -Werror=format-security -X -Werror=format-nonliteral -X -Werror=redundant-decls -X -Werror=int-conversion"
 VAPIGEN=$topbuilddir/vapigen/vapigen$EXEEXT
 VAPIGENFLAGS="--vapidir $vapidir"
 
@@ -99,7 +99,7 @@ EOF
 function sourceend() {
        if [ -n "$testpath" ]; then
                if [ $INVALIDCODE -eq 1 ]; then
-                       echo "! $VALAC --vapidir $vapidir -C $SOURCEFILE" > check
+                       echo "! $VALAC $VALAFLAGS -C $SOURCEFILE" > check
                elif [ $GIRTEST -eq 1 ]; then
                        if [ $PART -eq 1 ]; then
                                echo "  </namespace>" >> $SOURCEFILE