tests: Fix and make fast-vapi test actually fatal

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 5c8a097c2be53e519ff3df0a9be2aadb4be745c6..9e836b1d7ba13d35dd4d0ef88b2936a947ce5bb7 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -971,7 +971,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 cc002565434853732f1bd90d528915325cd6fead..86614655c36548178acd11e7990907d9369bd54b 100644 (file)
--- 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; \
+               $(srcdir)/usefastvapitest.vala || exit 1; \
        rm -f fastvapitest.vapi fastvapitest.c usefastvapitest.c
 
 check: check-fastvapi