[gobject-introspection] tests/doctool: Switch to test the mallard formatter

[Tomeu Vizoso <tomeuv src gnome org>]

commit 216c11ec554534913fcbcbe421b0f9e6a2f1028a
Author: Tomeu Vizoso <tomeu vizoso collabora co uk>
Date:   Mon Aug 15 14:04:03 2011 +0200

    tests/doctool: Switch to test the mallard formatter

 tests/doctool/GIRepository-2.0-C-expected.page     |   19 +
 tests/doctool/GIRepository-2.0-C-expected.xml      | 1823 --------------------
 .../doctool/GIRepository-2.0-Python-expected.page  |   19 +
 tests/doctool/GIRepository-2.0-Python-expected.xml | 1823 --------------------
 tests/doctool/Makefile.am                          |   28 +-
 5 files changed, 52 insertions(+), 3660 deletions(-)
---
diff --git a/tests/doctool/GIRepository-2.0-C-expected.page b/tests/doctool/GIRepository-2.0-C-expected.page
new file mode 100644
index 0000000..badacf0
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected.page
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<page id="index"
+      type="guide"
+      style="namespace"
+      xmlns="http://projectmallard.org/1.0/";
+      xmlns:ui="http://projectmallard.org/experimental/ui/";>
+  <info>
+  </info>
+  <title>GIRepository Documentation</title>
+  <links type="topic" ui:expanded="yes" groups="class">
+    <title>Classes</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="function">
+    <title>Functions</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="#first #default #last">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected.page b/tests/doctool/GIRepository-2.0-Python-expected.page
new file mode 100644
index 0000000..badacf0
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-Python-expected.page
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<page id="index"
+      type="guide"
+      style="namespace"
+      xmlns="http://projectmallard.org/1.0/";
+      xmlns:ui="http://projectmallard.org/experimental/ui/";>
+  <info>
+  </info>
+  <title>GIRepository Documentation</title>
+  <links type="topic" ui:expanded="yes" groups="class">
+    <title>Classes</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="function">
+    <title>Functions</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="#first #default #last">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/doctool/Makefile.am b/tests/doctool/Makefile.am
index 75ca4bc..801eefb 100644
--- a/tests/doctool/Makefile.am
+++ b/tests/doctool/Makefile.am
@@ -4,23 +4,23 @@ GIRepository-2.0.gir:
 	cp ../../GIRepository-2.0.gir .
 
 GIRS = GIRepository-2.0.gir
-CHECKXML = $(GIRS:.gir=-C.xml.check) $(GIRS:.gir=-Python.xml.check)
-DOCBOOKFILES = $(GIRS:.gir=-C.xml) $(GIRS:.gir=-Python.xml)
-EXPECTEDDOCBOOKFILES = $(DOCBOOKFILES:.xml=-expected.xml)
-CLEANFILES = $(DOCBOOK_FILES)
-BUILT_SOURCES = $(DOCBOOK_FILES)
-EXTRA_DIST = $(EXPECTEDDOCBOOKFILES)
+CHECKXML = $(GIRS:.gir=-C.page.check) $(GIRS:.gir=-Python.page.check)
+MALLARDFILES = $(GIRS:.gir=-C.page) $(GIRS:.gir=-Python.page)
+EXPECTEDMALLARDFILES = $(MALLARDFILES:.page=-expected.page)
+CLEANFILES = $(MALLARD_FILES)
+BUILT_SOURCES = $(MALLARD_FILES)
+EXTRA_DIST = $(EXPECTEDMALLARDFILES)
 
-%-C.xml: %.gir
-	$(INTROSPECTION_DOCTOOL) --language C $*.gir -o $*-C.xml && echo "  GEN  $*-C.xml"
+%-C.page: %.gir
+	$(INTROSPECTION_DOCTOOL) --language C --format mallard $*.gir -o $*-C.page && echo "  GEN  $*-C.page"
 
-%-Python.xml: %.gir
-	$(INTROSPECTION_DOCTOOL) --language Python $*.gir -o $*-Python.xml && echo "  GEN  $*-Python.xml"
+%-Python.page: %.gir
+	$(INTROSPECTION_DOCTOOL) --language Python --format mallard $*.gir -o $*-Python.page && echo "  GEN  $*-Python.page"
 
-%-C.xml.check: %-C.xml
-	@diff -u -U 10 $(srcdir)/$*-C-expected.xml $*-C.xml && echo "  TEST  $*-C.xml"
+%-C.page.check: %-C.page
+	@diff -u -U 10 $(srcdir)/$*-C-expected.page $*-C.page && echo "  TEST  $*-C.page"
 
-%-Python.xml.check: %-Python.xml
-	@diff -u -U 10 $(srcdir)/$*-Python-expected.xml $*-Python.xml && echo "  TEST  $*-Python.xml"
+%-Python.page.check: %-Python.page
+	@diff -u -U 10 $(srcdir)/$*-Python-expected.page $*-Python.page && echo "  TEST  $*-Python.page"
 
 check-local: $(CHECKXML)