[vala-tests] Pass more tests by guessing more packages

[Marc-Andre Lureau <malureau src gnome org>]

commit 5834304e7a5473122756041dad7324f33da52cae
Author: Marc-André Lureau <marcandre lureau gmail com>
Date:   Thu Mar 25 02:17:35 2010 +0100

    Pass more tests by guessing more packages

 src/test-common.sh                         |   22 ++++++++++++++++++----
 tests/examples/gio-channel.test            |    1 +
 tests/examples/hildon-sample.test          |    3 ---
 tests/examples/soup-http-server.test       |    1 +
 tests/examples/type-modules-interface.test |    1 +
 5 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/src/test-common.sh b/src/test-common.sh
index a1ae8c6..1b320f3 100644
--- a/src/test-common.sh
+++ b/src/test-common.sh
@@ -21,7 +21,7 @@ function _test_get_args {
 
 # hackish
 function _test_make_guesses {
-    ! grep "main" $TESTSRC >/dev/null && TESTRUN="${TESTRUN:-no}" VALAFLAGS="${VALAFLAGS:- -C}"
+    ! grep "main" $TESTSRC >/dev/null && TESTRUN="${TESTRUN:-no}" VALAFLAGS="$VALAFLAGS -C"
     grep "Gtk" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gtk+-2.0" TESTRUN="${TESTRUN:-interact}"
     grep -i "gio" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gio-2.0"
     grep "DBus\." $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg dbus-glib-1" TESTRUN="${TESTRUN:-skip}"
@@ -42,8 +42,20 @@ function _test_make_guesses {
     grep "Gee" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gee-1.0"
     grep "Xml" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg libxml-2.0"
     grep "Clutter\." $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg clutter-1.0" TESTRUN="${TESTRUN:-interact}"
-    grep "CouchDB" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg couchdb-glib-1.0"
     grep "Curses" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg curses -X -lncurses" TESTRUN="${TESTRUN:-interact}"
+    grep "Soup" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg libsoup-2.4"
+    grep "Json" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg json-glib-1.0"
+    grep "SDL" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg sdl"
+    grep "CouchDB" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg couchdb-glib-1.0"
+    grep "Sqlite" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg sqlite3"
+    grep "Posix" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg posix"
+    grep "Hildon" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg hildon-1"
+    grep "Readline" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg readline"
+    grep "DesktopAppInfo" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gio-unix-2.0"
+    grep "Gsl" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gsl" VALAFLAGS="$VALAFLAGS -X -lgsl -X -lgslcblas -X -lm"
+    grep "ZLib" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg zlib -X -lz"
+    grep "Lua" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg lua -X -llua -X -ldl -X -lm"
+    grep "using Lm" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg loudmouth-1.0"
 }
 
 function _test_setup() {
@@ -51,8 +63,7 @@ function _test_setup() {
     TESTNAME=`basename $0 .test`
     SRCDIR=`dirname $0`
     TESTSRC="${TESTSRC:-$SRCDIR/$TESTNAME.vala}"
-     echo $TESTRUN
-     _test_make_guesses
+    _test_make_guesses
     TESTRUN="${TESTRUN:-yes}"
     TESTENV="${TESTENV:-G_DEBUG=fatal_warnings}"
     TESTEXIT="${TESTEXIT:-0}"
@@ -115,6 +126,9 @@ function _test_compile_check {
 }
 
 function _test_compile {
+    if [ -n "$CFLAGS" ]; then
+       VALAFLAGS="$VALAFLAGS -X '$CFLAGS'"
+    fi
     compile="$VALAC $PACKAGES -o $TESTNAME $TESTSRC $VALAFLAGS"
     echo "$compile"
     sh -c "$compile" >$STDOUT 2>$STDERR
diff --git a/tests/examples/gio-channel.test b/tests/examples/gio-channel.test
index 8c65445..bba401b 100755
--- a/tests/examples/gio-channel.test
+++ b/tests/examples/gio-channel.test
@@ -1,3 +1,4 @@
 #!/bin/bash
 
+TESTRUN=interact
 . test-common.sh
diff --git a/tests/examples/soup-http-server.test b/tests/examples/soup-http-server.test
index 8c65445..bba401b 100755
--- a/tests/examples/soup-http-server.test
+++ b/tests/examples/soup-http-server.test
@@ -1,3 +1,4 @@
 #!/bin/bash
 
+TESTRUN=interact
 . test-common.sh
diff --git a/tests/examples/type-modules-interface.test b/tests/examples/type-modules-interface.test
index 8c65445..f6071d2 100755
--- a/tests/examples/type-modules-interface.test
+++ b/tests/examples/type-modules-interface.test
@@ -1,3 +1,4 @@
 #!/bin/bash
 
+TESTRUN=no
 . test-common.sh