[vala/0.46] tests: Fix and make fast-vapi test actually fatal

[Rico Tzschichholz <ricotz src gnome org>]

commit f607393ccb0603f33cd550e0d79c3eb5a2caa733
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Tue Nov 19 09:34:50 2019 +0100

    tests: Fix and make fast-vapi test actually fatal

 codegen/valaccodebasemodule.vala | 2 +-
 tests/fastvapi/Makefile.am       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 5cbc88e6a..a4ee7ebe2 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -961,7 +961,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                        return;
                }
 
-               if (!c.external || (c.source_type == SourceFileType.FAST && c.value != null)) {
+               if (!c.external && c.value != null) {
                        generate_type_declaration (c.type_reference, decl_space);
 
                        c.value.emit (this);
diff --git a/tests/fastvapi/Makefile.am b/tests/fastvapi/Makefile.am
index cc0025654..83f714663 100644
--- a/tests/fastvapi/Makefile.am
+++ b/tests/fastvapi/Makefile.am
@@ -4,6 +4,7 @@ check-fastvapi: $(top_builddir)/compiler/valac
        G_DEBUG=fatal-warnings $(top_builddir)/compiler/valac \
                -C \
                --disable-version-header \
+               --vapidir $(top_srcdir)/vapi \
                --fast-vapi fastvapitest.vapi \
                --basedir $(srcdir) \
                $(srcdir)/fastvapitest.vala; \
@@ -11,9 +12,10 @@ check-fastvapi: $(top_builddir)/compiler/valac
        G_DEBUG=fatal-warnings $(top_builddir)/compiler/valac \
                -C \
                --disable-version-header \
+               --vapidir $(top_srcdir)/vapi \
                --use-fast-vapi fastvapitest.vapi \
-               --basedir $(srcdir) \
-               $(srcdir)/usefastvapitest.vala; \
+               --basedir $(builddir) \
+               $(srcdir)/usefastvapitest.vala || exit 1; \
        rm -f fastvapitest.vapi fastvapitest.c usefastvapitest.c
 
 check: check-fastvapi