tests: Fix build and update for API changes

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ea7f341a2747daddf9da5bf244f389aa1f5c1976..7a17a087d22d0331bbe3cc9cfbdf0d64212287a3 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,17 +23,44 @@ TESTS = \
        libvaladoc/parser/sequencerule.vala \
        libvaladoc/parser/optionalrule.vala \
        libvaladoc/parser/stubrule.vala \
-       drivers/driver-0-20.vala \
-       drivers/driver-0-22.vala \
-       drivers/driver-0-24.vala \
-       drivers/driver-0-26.vala \
-       drivers/driver-0-28.vala \
-       drivers/driver-0-30.vala \
-       drivers/driver-0-32.vala \
-       drivers/driver-0-34.vala \
-       drivers/driver-0-36.vala \
        $(NULL)
 
+if HAVE_LIBVALA_0_20_X
+TESTS += drivers/driver-0-20.vala
+endif
+
+if HAVE_LIBVALA_0_22_X
+TESTS += drivers/driver-0-22.vala
+endif
+
+if HAVE_LIBVALA_0_24_X
+TESTS += drivers/driver-0-24.vala
+endif
+
+if HAVE_LIBVALA_0_26_X
+TESTS += drivers/driver-0-26.vala
+endif
+
+if HAVE_LIBVALA_0_28_X
+TESTS += drivers/driver-0-28.vala
+endif
+
+if HAVE_LIBVALA_0_30_X
+TESTS += drivers/driver-0-30.vala
+endif
+
+if HAVE_LIBVALA_0_32_X
+TESTS += drivers/driver-0-32.vala
+endif
+
+if HAVE_LIBVALA_0_34_X
+TESTS += drivers/driver-0-34.vala
+endif
+
+if HAVE_LIBVALA_0_36_X
+TESTS += drivers/driver-0-36.vala
+endif
+
 check-TESTS: $(TESTS)
        @EXEEXT=$(EXEEXT) TOPBUILDDIR=$(abs_top_builddir) TOPSRCDIR=$(abs_top_srcdir) $(srcdir)/testrunner.sh $(TESTS)
 

diff --git a/tests/libvaladoc/errorreporter.vala b/tests/libvaladoc/errorreporter.vala
index 2b77ffa2a99ec50e4d9774c1f77544ffff9b837c..59e5e53046a409b7bf13d0c0a4f3c3e60edd35fb 100644 (file)
--- a/tests/libvaladoc/errorreporter.vala
+++ b/tests/libvaladoc/errorreporter.vala
@@ -29,21 +29,21 @@ void main () {
        assert (reporter.errors == 0);
 
        // simple errors:
-       reporter.simple_error ("error 1 %d %s", 1, "foo");
+       reporter.simple_error ("test", "error 1 %d %s", 1, "foo");
        assert (reporter.warnings == 0);
        assert (reporter.errors == 1);
 
-       reporter.simple_error ("error 2");
+       reporter.simple_error (null, "error 2");
        assert (reporter.warnings == 0);
        assert (reporter.errors == 2);
 
 
        // simple warnings:
-       reporter.simple_warning ("warning 1 %d %s", 1, "foo");
+       reporter.simple_warning ("test", "warning 1 %d %s", 1, "foo");
        assert (reporter.warnings == 1);
        assert (reporter.errors == 2);
 
-       reporter.simple_warning ("warning 2");
+       reporter.simple_warning (null, "warning 2");
        assert (reporter.warnings == 2);
        assert (reporter.errors == 2);