[vala/wip/merge-valadoc] valadoc: Run driver tests

[Rico Tzschichholz <ricotz src gnome org>]

commit c9c6b4dd19066300281bf7c85ca0a07353ca27ac
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sun Jun 4 14:54:45 2017 +0200

    valadoc: Run driver tests

 libvaladoc/Makefile.am                      |    2 +-
 valadoc/.gitignore                          |    1 +
 valadoc/Makefile.am                         |    2 +-
 valadoc/doclets/devhelp/Makefile.am         |    2 +-
 valadoc/doclets/gtkdoc/Makefile.am          |    2 +-
 valadoc/doclets/html/Makefile.am            |    2 +-
 valadoc/tests/Makefile.am                   |   81 ++++++++++++++++++++++++---
 valadoc/tests/drivers/driver-test.vala      |    3 +
 valadoc/tests/drivers/generic-api-test.vala |   14 +---
 valadoc/tests/testrunner.sh                 |    3 +-
 10 files changed, 88 insertions(+), 24 deletions(-)
---
diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
index 4452e7b..4ce7949 100644
--- a/libvaladoc/Makefile.am
+++ b/libvaladoc/Makefile.am
@@ -172,7 +172,7 @@ libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
 
 valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp
 libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
-       $(VALAC) \
+       $(VALA_V)$(VALAC) \
                $(VALAFLAGS) \
                --basedir $(srcdir) \
                --directory $(builddir) \
diff --git a/valadoc/.gitignore b/valadoc/.gitignore
index ed661db..5130707 100644
--- a/valadoc/.gitignore
+++ b/valadoc/.gitignore
@@ -1 +1,2 @@
 valadoc
+tests/driver
diff --git a/valadoc/Makefile.am b/valadoc/Makefile.am
index c6c9cda..a830df8 100644
--- a/valadoc/Makefile.am
+++ b/valadoc/Makefile.am
@@ -50,7 +50,7 @@ valadoc_LDADD = \
        $(NULL)
 
 valadoc.vala.stamp: $(valadoc_VALASOURCES) $(top_srcdir)/vala/libvala@PACKAGE_SUFFIX@.vapi 
$(top_srcdir)/libvaladoc/valadoc@PACKAGE_SUFFIX@.vapi
-       $(VALAC) \
+       $(VALA_V)$(VALAC) \
                $(VALAFLAGS) \
                -C \
                --vapidir $(top_srcdir)/vala \
diff --git a/valadoc/doclets/devhelp/Makefile.am b/valadoc/doclets/devhelp/Makefile.am
index b1ad704..617708c 100644
--- a/valadoc/doclets/devhelp/Makefile.am
+++ b/valadoc/doclets/devhelp/Makefile.am
@@ -28,7 +28,7 @@ libdoclet_la_SOURCES = \
        $(NULL)
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-       $(VALAC) \
+       $(VALA_V)$(VALAC) \
                $(VALAFLAGS) \
                -C \
                --vapidir $(top_srcdir)/vala \
diff --git a/valadoc/doclets/gtkdoc/Makefile.am b/valadoc/doclets/gtkdoc/Makefile.am
index c0d35ab..153d8b5 100644
--- a/valadoc/doclets/gtkdoc/Makefile.am
+++ b/valadoc/doclets/gtkdoc/Makefile.am
@@ -33,7 +33,7 @@ libdoclet_la_SOURCES = \
        $(NULL)
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-       $(VALAC) \
+       $(VALA_V)$(VALAC) \
                $(VALAFLAGS) \
                -C \
                --vapidir $(top_srcdir)/vala \
diff --git a/valadoc/doclets/html/Makefile.am b/valadoc/doclets/html/Makefile.am
index 6484bba..38a0005 100644
--- a/valadoc/doclets/html/Makefile.am
+++ b/valadoc/doclets/html/Makefile.am
@@ -28,7 +28,7 @@ libdoclet_la_SOURCES = \
        $(NULL)
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-       $(VALAC) \
+       $(VALA_V)$(VALAC) \
                $(VALAFLAGS) \
                -C \
                --vapidir $(top_srcdir)/vala \
diff --git a/valadoc/tests/Makefile.am b/valadoc/tests/Makefile.am
index 8ce2e69..d68d402 100644
--- a/valadoc/tests/Makefile.am
+++ b/valadoc/tests/Makefile.am
@@ -1,13 +1,5 @@
 NULL =
 
-AM_CPPFLAGS = \
-       $(GLIB_CFLAGS) \
-       $(NULL)
-
-AM_LDFLAGS = \
-       $(GLIB_LIBS) \
-       $(NULL)
-
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) PACKAGE_SUFFIX=$(PACKAGE_SUFFIX) TOPBUILDDIR=$(abs_top_builddir) 
TOPSRCDIR=$(abs_top_srcdir) $(srcdir)/testrunner.sh
 
 TESTS = \
@@ -23,12 +15,85 @@ TESTS = \
 
 check-TESTS: $(TESTS)
        @EXEEXT=$(EXEEXT) PACKAGE_SUFFIX=$(PACKAGE_SUFFIX) TOPBUILDDIR=$(abs_top_builddir) 
TOPSRCDIR=$(abs_top_srcdir) $(srcdir)/testrunner.sh $(TESTS)
+       G_DEBUG=fatal_warnings $(builddir)/driver
+
+AM_CFLAGS = \
+       -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
+       -DPACKAGE_VERSION=\"$(VERSION)\" \
+       -DTOP_SRC_DIR=\"$(abs_top_srcdir)\" \
+       -I$(top_srcdir)/libvaladoc/ \
+       -I$(top_srcdir)/gee \
+       -I$(top_srcdir)/ccode \
+       -I$(top_srcdir)/vala \
+       -I$(top_srcdir)/codegen \
+       $(GLIB_CFLAGS) \
+       $(GMODULE_CFLAGS) \
+       $(LIBGVC_CFLAGS) \
+       $(NULL)
+
+BUILT_SOURCES = driver.vala.stamp
+
+check_PROGRAMS = driver
+
+driver_VALASOURCES = \
+       drivers/driver-test.vala \
+       drivers/generic-api-test.vala \
+       $(top_srcdir)/valadoc/driver.vala \
+       $(top_srcdir)/valadoc/girwriter.vala \
+       $(top_srcdir)/valadoc/initializerbuilder.vala \
+       $(top_srcdir)/valadoc/symbolresolver.vala \
+       $(top_srcdir)/valadoc/treebuilder.vala \
+    $(NULL)
+
+driver_SOURCES = \
+       driver.vala.stamp \
+       drivers/driver-test.c \
+       drivers/generic-api-test.c \
+       driver.c \
+       girwriter.c \
+       initializerbuilder.c \
+       symbolresolver.c \
+       treebuilder.c \
+       $(NULL)
+
+driver_LDADD = \
+       $(top_builddir)/libvaladoc/libvaladoc@PACKAGE_SUFFIX@.la \
+       $(top_builddir)/vala/libvala@PACKAGE_SUFFIX@.la \
+       $(top_builddir)/ccode/libvalaccode.la \
+       $(top_builddir)/codegen/libvalaccodegen.la \
+       $(GLIB_LIBS) \
+       $(GMODULE_LIBS) \
+       $(LIBGVC_LIBS) \
+       $(NULL)
+
+driver.vala.stamp: $(driver_VALASOURCES) $(top_srcdir)/vala/libvala@PACKAGE_SUFFIX@.vapi 
$(top_srcdir)/libvaladoc/valadoc@PACKAGE_SUFFIX@.vapi
+       $(VALA_V)$(VALAC) \
+               $(VALAFLAGS) \
+               -C \
+               --vapidir $(top_srcdir)/vapi \
+               --pkg gmodule-2.0 \
+               --pkg gobject-2.0 \
+               --pkg libgvc \
+               --vapidir $(top_srcdir)/vala --pkg libvala@PACKAGE_SUFFIX@ \
+               --vapidir $(top_srcdir)/ccode --pkg ccode \
+               --vapidir $(top_srcdir)/codegen --pkg codegen \
+               --vapidir $(top_srcdir)/libvaladoc --pkg valadoc@PACKAGE_SUFFIX@ \
+               --pkg config \
+               $(filter %.vala %.c,$^)
+       touch $@
 
 EXTRA_DIST = \
+       driver.vala.stamp \
+       $(driver_SOURCES) \
        testrunner.sh \
        drivers/api-test.data.vapi \
+       drivers/driver-test.vala \
        drivers/generic-api-test.vala \
        libvaladoc/parser/generic-scanner.vala \
        $(TESTS) \
        $(NULL)
 
+MAINTAINERCLEANFILES = \
+       driver.vala.stamp \
+       $(driver_SOURCES) \
+       $(NULL)
diff --git a/valadoc/tests/drivers/driver-test.vala b/valadoc/tests/drivers/driver-test.vala
new file mode 100644
index 0000000..7a8f5c6
--- /dev/null
+++ b/valadoc/tests/drivers/driver-test.vala
@@ -0,0 +1,3 @@
+public static void main () {
+       test_driver ();
+}
diff --git a/valadoc/tests/drivers/generic-api-test.vala b/valadoc/tests/drivers/generic-api-test.vala
index 3347bcb..74ef7d8 100644
--- a/valadoc/tests/drivers/generic-api-test.vala
+++ b/valadoc/tests/drivers/generic-api-test.vala
@@ -23,7 +23,7 @@
 
 using Valadoc;
 
-[CCode (name = "TOP_SRC_DIR")]
+[CCode (cname = "TOP_SRC_DIR")]
 extern const string TOP_SRC_DIR;
 
 
@@ -2712,12 +2712,7 @@ public static void test_package_out (Api.Package pkg) {
 }
 
 
-public static void test_driver (string driver_path) {
-       if (!FileUtils.test (driver_path, FileTest.EXISTS)) {
-               message ("Driver '%s' is not available", Valadoc.realpath (driver_path));
-               assert_not_reached ();
-       }
-
+public static void test_driver () {
        var settings = new Valadoc.Settings ();
        var reporter = new ErrorReporter ();
 
@@ -2735,12 +2730,11 @@ public static void test_driver (string driver_path) {
        settings.path = "out";
 
 
-       ModuleLoader modules = ModuleLoader.get_instance ();
-       var driver = null; //modules.create_driver (driver_path);
+       var driver = new Valadoc.Drivers.Driver ();
        assert (driver != null);
 
 
-       Api.Tree? doctree = null; //driver.build (settings, reporter);
+       Api.Tree? doctree = driver.build (settings, reporter);
        assert (reporter.errors == 0);
        assert (doctree != null);
 
diff --git a/valadoc/tests/testrunner.sh b/valadoc/tests/testrunner.sh
index 6f299df..59302ff 100755
--- a/valadoc/tests/testrunner.sh
+++ b/valadoc/tests/testrunner.sh
@@ -30,7 +30,8 @@ export PKG_CONFIG_PATH=$topbuilddir/libvaladoc
 export LD_LIBRARY_PATH=$topbuilddir/gee/.libs:$topbuilddir/libvaladoc/.libs
 
 VALAC=$topbuilddir/compiler/valac$EXEEXT
-VALAFLAGS="-X -D -X TOP_SRC_DIR=\"$topsrcdir\" --vapidir $vapidir --pkg libgvc --vapidir $topsrcdir/vala 
--pkg libvala$PACKAGE_SUFFIX --vapidir $topsrcdir/libvaladoc --pkg valadoc$PACKAGE_SUFFIX --disable-warnings 
--main main --save-temps -X -g -X -O0 -X -pipe -X -lm -X -Werror=return-type -X -Werror=init-self -X 
-Werror=implicit -X -Werror=sequence-point -X -Werror=return-type -X -Werror=uninitialized -X 
-Werror=pointer-arith -X -Werror=int-to-pointer-cast -X -Werror=pointer-to-int-cast -X -Wformat -X 
-Werror=format-security -X -Werror=format-nonliteral -X -Werror=redundant-decls -X -Werror=int-conversion -X 
-L$topbuilddir/gee/.libs -X -lgee -X -L$topbuilddir/libvaladoc/.libs -X -lvaladoc$PACKAGE_SUFFIX -X 
-I$topsrcdir/gee -X -I$topsrcdir/libvaladoc $topsrcdir/valadoc/tests/libvaladoc/parser/generic-scanner.vala 
$topsrcdir/valadoc/tests/drivers/generic-api-test.vala"
+VALAFLAGS="-X -D -X TOP_SRC_DIR=\"$topsrcdir\" --vapidir $vapidir --pkg libgvc --vapidir $topsrcdir/vala 
--pkg libvala$PACKAGE_SUFFIX --vapidir $topsrcdir/libvaladoc --pkg valadoc$PACKAGE_SUFFIX --disable-warnings 
--main main --save-temps -X -g -X -O0 -X -pipe -X -lm -X -Werror=return-type -X -Werror=init-self -X 
-Werror=implicit -X -Werror=sequence-point -X -Werror=return-type -X -Werror=uninitialized -X 
-Werror=pointer-arith -X -Werror=int-to-pointer-cast -X -Werror=pointer-to-int-cast -X -Wformat -X 
-Werror=format-security -X -Werror=format-nonliteral -X -Werror=redundant-decls -X -Werror=int-conversion -X 
-L$topbuilddir/gee/.libs -X -lgee -X -L$topbuilddir/libvaladoc/.libs -X -lvaladoc$PACKAGE_SUFFIX -X 
-I$topsrcdir/gee -X -I$topsrcdir/libvaladoc $topsrcdir/valadoc/tests/libvaladoc/parser/generic-scanner.vala"
+
 
 # Incorporate the user's CFLAGS. Matters if the user decided to insert
 # -m32 in CFLAGS, for example.