From: Bruno Haible <bruno@clisp.org>
Date: Tue, 15 Jun 2021 08:32:19 +0000 (+0200)
Subject: Avoid lang-vala failure on macOS with MacPorts.
X-Git-Tag: v0.21.1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb786ff3398dcadb63014002de61d4be695f6a72;p=thirdparty%2Fgettext.git

Avoid lang-vala failure on macOS with MacPorts.

* gettext-tools/tests/lang-vala: Skip the test if the valac invocation reports
that <glib.h> is not installed.
---

diff --git a/gettext-tools/tests/lang-vala b/gettext-tools/tests/lang-vala
index b24de6a67..bf04f8edc 100755
--- a/gettext-tools/tests/lang-vala
+++ b/gettext-tools/tests/lang-vala
@@ -23,7 +23,12 @@ test $? -le 1 \
 
 : ${VALAC=valac}
 ${VALAC} --Xcc=-DGETTEXT_PACKAGE=\"prog\" prog.vala 2>prog.err \
-  || { cat prog.err 1>&2; Exit 1; }
+  || { if grep "fatal error: 'glib\.h' file not found" < prog.err > /dev/null; then
+         echo "Skipping test: valac installation incomplete"; Exit 77
+       else
+         cat prog.err 1>&2; Exit 1
+       fi
+     }
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.vala || Exit 1