Re-run against new glib/gobject girs

svn path=/trunk/; revision=411

diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index cef53e782b8cbfda374d5b35241ee6d04a21d0da..981e95e5dc77532cb1a2b78e688bf28719770790 100644 (file)
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -86,12 +86,17 @@ pre-check:
        fi
        @echo "Running scanner checks..."
 
-check-local: pre-check check-utility.gir check-annotation.gir check-drawable.gir check-foo.gir
-       @echo "======================="
-       @echo "All parser tests passed"
-       @echo "======================="
+post-check:
+       @echo "========================"
+       @echo "All scanner tests passed"
+       @echo "========================"
        @if test "$(top_builddir)" != "$(top_srcdir)"; then \
           rm -f $(top_builddir)/giscanner/*.py*; \
        fi
 
+check-local: pre-check
+check-local: check-utility.gir check-annotation.gir 
+check-local: check-drawable.gir check-foo.gir
+check-local: post-check
+
 .PHONY: annotation.gir drawable.gir foo.gir utility.gir 

diff --git a/tests/scanner/annotation-expected.gir b/tests/scanner/annotation-expected.gir
index 3f2754800e886a280f7f0d0018569fc564ec41f8..d2cd9482e1d000042092fd6a09cc7e7d6db2c90e 100644 (file)
--- a/tests/scanner/annotation-expected.gir
+++ b/tests/scanner/annotation-expected.gir
@@ -10,7 +10,7 @@
     </record>
     <record name="AnnotationObjectClass" c:type="AnnotationObjectClass">
       <field name="parent_class">
-        <type name="GObjectClass" c:type="GObjectClass"/>
+        <type name="GObject.Class" c:type="GObjectClass"/>
       </field>
     </record>
     <function name="annotation_object_method"