Disable roundtrip tests which are not yet working Rewrite as gir.

2008-08-08  Johan Dahlin  <johan@gnome.org>

    * tests/Makefile.am:
    Disable roundtrip tests which are not yet working
    * tests/invoke/testfns.gir:
    Rewrite as gir.
2008-08-08  Johan Dahlin  <johan@gnome.org>

    * tests/Makefile.am:
    Disable roundtrip tests which are not yet working
    * tests/invoke/testfns.gir:
    Rewrite as gir.

svn path=/trunk/; revision=327

diff --git a/ChangeLog b/ChangeLog
index 7258b62..2daad17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-08-08  Johan Dahlin  <johan@gnome.org>
 
+       * tests/Makefile.am:
+       Disable roundtrip tests which are not yet working
+       * tests/invoke/testfns.gir:
+       Rewrite as gir.
+
+2008-08-08  Johan Dahlin  <johan@gnome.org>
+
        * giscanner/girwriter.py:
        type -> ntype
        * giscanner/glibast.py:

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 384f052..1d54225 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,4 +17,4 @@ EXTRA_DIST = \
        xref1.test      \
        xref2.test
 
-TESTS = roundtrips.sh
+TESTS = #roundtrips.sh

diff --git a/tests/invoke/testfns.gir b/tests/invoke/testfns.gir
index 4d6c520..df323c9 100755 (executable)
--- a/tests/invoke/testfns.gir
+++ b/tests/invoke/testfns.gir
@@ -5,59 +5,93 @@
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
   <namespace name="test">
     <function name="test1" c:identifier="test1">
-      <return-type c:type="gint"/>
+      <return-value>
+        <type name="int" c:type="gint"/>
+      </return-value>
       <parameters>
-        <parameter name="in" c:type="gint" direction="in"/>
+        <parameter name="in" direction="in">
+          <type name="int" c:type="gint"/>
+        </parameter>
       </parameters>
     </function>
 
     <function name="test2" c:identifier="test2">
-      <return-type c:type="void"/>
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
       <parameters>
-        <parameter name="in" c:type="gint" direction="in"/>
-        <parameter name="out" c:type="gint" direction="out"/>
+        <parameter name="in" c:type="gint" direction="in">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="out" c:type="gint" direction="out">
+          <type name="int" c:type="gint"/>
+        </parameter>
       </parameters>
     </function>
 
     <function name="test3" c:identifier="test3">
-      <return-type c:type="void"/>
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
       <parameters>
-        <parameter name="inout" c:type="gint" direction="inout"/>
+        <parameter name="inout" c:type="gint" direction="inout">
+          <type name="int" c:type="gint"/>
+        </parameter>
       </parameters>
     </function>
 
     <function name="test4" c:identifier="test4">
-      <return-type c:type="void"/>
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
       <parameters>
-        <parameter name="blurb" c:type="gchar*" direction="in"/>
+        <parameter name="blurb" direction="in">
+          <type name="utf8" c:type="gchar*"/>
+        </parameter>
       </parameters>
     </function>
 
     <function name="test5" c:identifier="test5">
-      <return-type c:type="void"/>
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
       <parameters>
-        <parameter name="blurb" c:type="gchar*" direction="out" transfer="full"/>
-        <parameter name="len" c:type="gint" direction="out"/>
+        <parameter name="blurb" direction="out" transfer="full">
+          <type name="utf8" c:type="gchar*"/>
+        </parameter>
+        <parameter name="len" direction="out">
+          <type name="int" c:type="gint"/>
+        </parameter>
       </parameters>
     </function>
 
     <function name="test6" c:identifier="test6">
-      <return-type c:type="gint"/>
+      <return-value>
+        <type name="int" c:type="gint"/>
+      </return-value>
       <parameters>
-        <parameter name="list" c:type="GList<gint>*" direction="in"/>
+        <parameter name="list" direction="in">
+          <type name="GList<gint>*" c:type="GList*"/>
+        </parameter>
       </parameters>
     </function>
 
 
     <function name="test7" c:identifier="test7">
-      <return-type c:type="utf8" transfer="full"/>
+      <return-value transfer="full">
+         <type name="utf8" c:type="gchar*"/>
+      </return-value>
       <parameters>
-        <parameter name="list" c:type="GList<utf8>*" direction="in"/>
+        <parameter name="list" direction="in">
+          <type name="GList<utf8>*" c:type="GList*"/>
+        </parameter>
       </parameters>
     </function>
 
     <function name="broken" c:identifier="broken">
-      <return-type c:type="void"/>
+      <return-value>
+         <type name="void" c:type="void"/>
+      </return-value>
     </function>
 
   </namespace>