vala-tests r42 - trunk/tests/bugs

[malureau svn gnome org]

Author: malureau
Date: Sun Oct 19 13:51:14 2008
New Revision: 42
URL: http://svn.gnome.org/viewvc/vala-tests?rev=42&view=rev

Log:
Use test.sh instead of update.sh

Added:
   trunk/tests/bugs/test.sh   (contents, props changed)
Modified:
   trunk/tests/bugs/update.sh

Added: trunk/tests/bugs/test.sh
==============================================================================
--- (empty file)
+++ trunk/tests/bugs/test.sh	Sun Oct 19 13:51:14 2008
@@ -0,0 +1,151 @@
+#!/bin/sh
+
+set -e
+
+skip="
+516287
+536863
+539969
+548442
+"
+
+interactive="
+"
+
+deprecated="
+"
+
+norun="
+433290
+436011
+436760
+442703
+"
+
+invalid="
+434503
+434514
+435853
+435854
+556881
+"
+
+SRCDIR=../tests/bugs
+VALABANG=
+VALAFLAGS=
+PACKAGES=
+[ "x$VALAC" = "x" ] && VALAC=valac SRCDIR=`dirname $0`
+
+TESTNAME=`basename $0 .test`
+TESTSRC="$SRCDIR/$TESTNAME.vala"
+TESTENV="G_DEBUG=fatal_warnings"
+TESTEXPECT=true
+BUGZILLA="http://bugzilla.gnome.org/show_bug.cgi?id=$TESTNAME";
+
+VALGRIND="$VALGRIND"
+VALGRINDENV="G_SLICE=always-malloc G_DEBUG=gc-friendly GLIBCPP_FORCE_NEW=1 GLIBCXX_FORCE_NEW=1"
+VALGRINDFLAGS="--tool=memcheck --leak-check=full --error-exitcode=1 -q" ;
+
+[ "$TESTNAME" = "433290" ] && TESTEXPECT="! grep -i my 433290.h" VALAFLAGS="$VALAFLAGS -C"
+[ "$TESTNAME" = "434515" ] && VALAFLAGS="$VALAFLAGS -D WITH_TEST"
+[ "$TESTNAME" = "435848" ] && VALAFLAGS="$VALAFLAGS -X -Wall"
+[ "$TESTNAME" = "435854" ] && VALAFLAGS="$VALAFLAGS -C"
+[ "$TESTNAME" = "436011" ] && VALAFLAGS="$VALAFLAGS -X -m64 -X -Wall -X -Werror"
+[ "$TESTNAME" = "436760" ] && TESTEXPECT="grep -q input_stream_ftp 436760.c" VALAFLAGS="$VALAFLAGS -C"
+[ "$TESTNAME" = "556881" ] && VALAFLAGS="$VALAFLAGS -C"
+[ "$TESTNAME" = "443514" ] && VALGRIND="valgrind"
+
+while true ; do
+    case "$1" in
+	--update)
+           update=yes ;
+           shift ;;
+	--clean)
+           clean=yes ;
+           shift ;;
+	--interact)
+           INTERACT=yes ;
+           shift ;;
+        --memcheck)
+           VALGRIND="valgrind" ;
+           shift ;;
+        --massif)
+           VALGRIND="valgrind" ;
+           VALGRINDFLAGS="--tool=massif --massif-out-file=$TESTNAME.massif -q" ;
+           shift ;;
+	--) shift ; break ;;
+	*) break ;;
+    esac
+done
+
+# update the links, and run optionally, if --check
+if [ `basename $0` = "test.sh" ] ; then
+  for file in *.vala ; do
+    test=`basename $file .vala`
+    for st in $skip ; do
+      [ $test = $st ] && continue 2
+    done
+    rm -f $test $test.test $test.{,c,h,o}
+    [ "x$clean" = "xyes" ] && continue
+    [ "x$update" = "xyes" ] || [ ! -e $test.test ] && ln -s $0 $test.test
+    echo "Running $test..." && ./$test.test $interact $@ || true
+  done
+  exit 0
+fi
+
+# hackish
+grep "Gtk" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gtk+-2.0"
+grep -i " gio" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gio-2.0"
+grep "DBus\." $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg dbus-glib-1"
+grep -i "cairo" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg cairo"
+grep "GConf\." $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gconf-2.0"
+grep "Glade\." $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg libglade-2.0"
+grep "Module\." $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gmodule-2.0"
+grep "Gnome\.Desktop" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gnome-desktop-2.0"
+grep "GMenu\." $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg libgnome-menu"
+grep "Gst\." $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gstreamer-0.10"
+grep "Gdk\.x11" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gdk-x11-2.0"
+grep "XOverlay" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gstreamer-interfaces-0.10"
+grep "using Panel" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg libpanelapplet-2.0"
+grep -i "pango" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg pangocairo"
+grep "Poppler\." $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg poppler-glib"
+grep "SocketConnection" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gnio"
+grep "WebKit" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg webkit-1.0"
+grep "Gee" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg gee-1.0"
+grep "Xml" $TESTSRC >/dev/null && PACKAGES="$PACKAGES --pkg libxml-2.0"
+
+RUN=yes
+for nr in $interactive ; do
+  [ $nr = $TESTNAME ] && RUN=interact
+done
+for nr in $norun; do
+  [ $nr = $TESTNAME ] && RUN=no VALAFLAGS="$VALAFLAGS -c"
+done
+for nr in $invalid; do
+  [ $nr = $TESTNAME ] && RUN=no VALABANG="!"
+done
+
+sh -c "$VALABANG $VALAC $PACKAGES -o $TESTNAME $TESTSRC $VALAFLAGS $VALAFLAGS"
+
+if [ "$?" != "0" ] && [ -n $VALABANG ]; then
+  echo ""
+  echo "*** WARNING: This vala test was expecting to fail ***"
+  echo ""
+  echo "Visit bug: $BUGZILLA"
+  exit $?
+fi
+
+sh -c "$TESTEXPECT"
+
+if [ "x$RUN" = "xyes" -o "x$INTERACT" = "xyes" ] ; then
+  if [ -z $VALGRIND ] ; then
+    sh -c "$TESTENV ./$TESTNAME $TESTARGS $@"
+  else
+    sh -c "$VALGRINDENV $TESTENV $VALGRIND $VALGRINDFLAGS ./$TESTNAME $TESTARGS $@"
+  fi
+else
+  echo ""
+  [ "x$RUN" = "xinteract" ] && echo "*** WARNING: This vala test is interactive and will not be run (try --interact) ***"
+  [ "x$RUN" = "xno" ] && rm -rf $TESTNAME.o
+fi
+

Modified: trunk/tests/bugs/update.sh
==============================================================================
--- trunk/tests/bugs/update.sh	(original)
+++ trunk/tests/bugs/update.sh	Sun Oct 19 13:51:14 2008
@@ -96,6 +96,7 @@
 
 BUGZILLA="http://bugzilla.gnome.org/show_bug.cgi?id=$test";
 
+rm -f $test.test
 cat >$test.test <<EOF
 #!/bin/sh