summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Dahlin <johan@src.gnome.org>2008-08-14 20:22:58 +0000
committerJohan Dahlin <johan@src.gnome.org>2008-08-14 20:22:58 +0000
commit2dd61f6963628d61cffbe56cc75bef0a3dd9ac1c (patch)
treeac702d0df4652d47ba185d7a752992895512f1d6
parent240b76445bcff480d8cfa8351bd84744d53bf897 (diff)
downloadgobject-introspection-2dd61f6963628d61cffbe56cc75bef0a3dd9ac1c.tar.gz
Convert two more tests, still not completely done though
svn path=/trunk/; revision=380
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/xref1.gir12
-rw-r--r--tests/xref2.gir12
3 files changed, 17 insertions, 9 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7ee560b3..d08b6a53 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,7 +26,7 @@ GIRTESTS = \
%.gir.test: %.gir
@echo Testing $<:
$(top_builddir)/tools/g-ir-compiler --raw $< > $<.1; \
- $(top_builddir)/tools/g-ir-generate --raw $<.1 > $<.2; \
+ $(top_builddir)/tools/g-ir-generate --raw $<.1 > $<.2; \
diff -u $< $<.2; rm $<.1 $<.2
check-local: $(GIRTESTS)
diff --git a/tests/xref1.gir b/tests/xref1.gir
index 8eb57af6..a55d4807 100644
--- a/tests/xref1.gir
+++ b/tests/xref1.gir
@@ -4,12 +4,16 @@
xmlns:c="http://www.gtk.org/introspection/c/1.0"
xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
<namespace name="Foo">
- <boxed name="Boxed" type-name="FooBoxed" get-type="foo_boxed_get_type">
- </boxed>
+ <glib:boxed glib:name="Boxed" glib:type-name="FooBoxed" glib:get-type="foo_boxed_get_type">
+ </glib:boxed>
<function name="test" symbol="foo_test">
- <return-type type="void" />
+ <return-value>
+ <type name="none"/>
+ </return-value>
<parameters>
- <parameter name="p1" type="Bar.Boxed*" transfer="full" direction="in" />
+ <parameter name="p1" transfer="full" direction="in">
+ <type name="Bar.Boxed*"/>
+ </parameter>
</parameters>
</function>
</namespace>
diff --git a/tests/xref2.gir b/tests/xref2.gir
index 053e3223..841fbb71 100644
--- a/tests/xref2.gir
+++ b/tests/xref2.gir
@@ -4,12 +4,16 @@
xmlns:c="http://www.gtk.org/introspection/c/1.0"
xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
<namespace name="Bar">
- <boxed name="Boxed" type-name="BarBoxed" get-type="bar_boxed_get_type">
- </boxed>
+ <glib:boxed glib:name="Boxed" glib:type-name="BarBoxed" glib:get-type="bar_boxed_get_type">
+ </glib:boxed>
<function name="test" symbol="bar_test">
- <return-type type="void" />
+ <return-value>
+ <type name="none"/>
+ </return-value>
<parameters>
- <parameter name="p1" type="Foo.Boxed*" transfer="full" direction="in" />
+ <parameter name="p1" transfer="full" direction="in">
+ <type name="Foo.Boxed*"/>
+ </parameter>
</parameters>
</function>
</namespace>