From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Tue, 19 Nov 2019 08:34:50 +0000 (+0100)
Subject: tests: Fix and make fast-vapi test actually fatal
X-Git-Tag: 0.47.2~40
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fkeep-around%2F8cd5a579a8a4a6b55c30cdd58387a61ec4b70917;p=thirdparty%2Fvala.git

tests: Fix and make fast-vapi test actually fatal
---

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 5c8a097c2..9e836b1d7 100644
--- 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 cc0025654..86614655c 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; \
+		$(srcdir)/usefastvapitest.vala || exit 1; \
 	rm -f fastvapitest.vapi fastvapitest.c usefastvapitest.c
 
 check: check-fastvapi