vala r1910 - in trunk: . tests vapi

[juergbi svn gnome org]

Author: juergbi
Date: Sat Oct 25 05:39:56 2008
New Revision: 1910
URL: http://svn.gnome.org/viewvc/vala?rev=1910&view=rev

Log:
2008-10-25  JÃrg Billeter  <j bitron ch>

	* tests/exceptions.exp:
	* tests/exceptions.vala:
	* tests/testrunner.sh:
	* vapi/Makefile.am:

	Remove libgee test to avoid conflict in vapidir


Modified:
   trunk/.bzrignore
   trunk/ChangeLog
   trunk/tests/exceptions.exp
   trunk/tests/exceptions.vala
   trunk/tests/testrunner.sh
   trunk/vapi/Makefile.am

Modified: trunk/.bzrignore
==============================================================================
--- trunk/.bzrignore	(original)
+++ trunk/.bzrignore	Sat Oct 25 05:39:56 2008
@@ -35,7 +35,6 @@
 gobject/gobject.vapi
 vala/vala.gidl
 vala/vala.vapi
-vapi/gee-1.0.vapi
 vapi/vala-1.0.vapi
 vapigen/vala-gen-introspect/vala-gen-introspect
 ccode/ccode.gidl

Modified: trunk/tests/exceptions.exp
==============================================================================
--- trunk/tests/exceptions.exp	(original)
+++ trunk/tests/exceptions.exp	Sat Oct 25 05:39:56 2008
@@ -1 +1 @@
-Exception Test: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+Exception Test: 1 2 3 4 5 6 7 8 9 10 11

Modified: trunk/tests/exceptions.vala
==============================================================================
--- trunk/tests/exceptions.vala	(original)
+++ trunk/tests/exceptions.vala	Sat Oct 25 05:39:56 2008
@@ -1,10 +1,8 @@
 using GLib;
-using Gee;
 
 errordomain Maman.BarError {
 	FOO,
-	BAR,
-	LIST
+	BAR
 }
 
 class Maman.Bar : Object {
@@ -30,17 +28,6 @@
 		stdout.printf (" 4");
 	}
 
-	public Gee.List<string> list () throws BarError {
-		Gee.List<string> result = new ArrayList<string> ();
-
-		result.add (" FOO");
-		result.add (" BAR");
-
-		throw new BarError.LIST (" 12");
-
-		return result;
-	}
-
 	public void error_cast_check (GLib.Error e) {}
 
 	public void run () {
@@ -65,27 +52,6 @@
 		}
 
 		stdout.printf (" 10");
-
-		try {
-			foreach (string s in list ()) {
-				stdout.printf (" BAD");
-
-				stdout.printf (" %s", s);
-
-				stdout.printf (" BAD");
-			}
-		} catch (BarError e) {
-			stdout.printf (" 11");
-
-			stdout.printf ("%s", e.message);
-
-			stdout.printf (" 13");
-		}
-
-		// test implicit cast to GLib.Error
-		error_cast_check (new BarError.FOO ("FOO"));
-
-		stdout.printf (" 14");
 	}
 
 	static void test_generic_catch () {
@@ -111,7 +77,7 @@
 		var bar = new Bar ();
 		bar.run ();
 
-		stdout.printf (" 15\n");
+		stdout.printf (" 11\n");
 
 		test_generic_catch ();
 

Modified: trunk/tests/testrunner.sh
==============================================================================
--- trunk/tests/testrunner.sh	(original)
+++ trunk/tests/testrunner.sh	Sat Oct 25 05:39:56 2008
@@ -35,7 +35,7 @@
 VALAC=$topbuilddir/compiler/valac
 CC="gcc -std=c99"
 CFLAGS="-O0 -g3 -I$topsrcdir -I$topbuilddir"
-LDLIBS="-lm ../gee/.libs/libgee.a"
+LDLIBS="-lm"
 
 CODE=0
 
@@ -43,7 +43,7 @@
 do
 	testsrc=${testcasesource/.vala/}
 	testbuild=`basename "$testsrc"`
-	if ! $VALAC -C --vapidir "$vapidir" --pkg gee-1.0 --basedir $topsrcdir -d $topbuilddir $testsrc.vala > $testbuild.err 2>&1
+	if ! $VALAC -C --vapidir "$vapidir" --basedir $topsrcdir -d $topbuilddir $testsrc.vala > $testbuild.err 2>&1
 	then
 		echo "ERROR: Compiling" $testcasesource 
 		cat $testbuild.err

Modified: trunk/vapi/Makefile.am
==============================================================================
--- trunk/vapi/Makefile.am	(original)
+++ trunk/vapi/Makefile.am	Sat Oct 25 05:39:56 2008
@@ -5,9 +5,6 @@
 vala-1.0.vapi: ../gee/gee.vapi ../ccode/ccode.vapi ../vala/vala.vapi ../gobject/gobject.vapi
 	cat $^ > $@
 
-gee-1.0.vapi: ../gee/gee.vapi
-	cat $^ > $@
-
 dist_vapi_DATA = \
 	atk.vapi \
 	bzlib.vapi \
@@ -138,5 +135,4 @@
 
 dist_noinst_DATA = \
 	config.vapi \
-	gee-1.0.vapi \
 	$(NULL)