From: Bruno Haible <bruno@clisp.org>
Date: Sun, 20 Jun 2021 01:42:13 +0000 (+0200)
Subject: Avoid lang-vala failure on Ubuntu 16.04 in 32-bit mode.
X-Git-Tag: v0.21.1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54802e055962e9dbbcac9913517f7c06bade6201;p=thirdparty%2Fgettext.git

Avoid lang-vala failure on Ubuntu 16.04 in 32-bit mode.

* gettext-tools/tests/lang-vala: Skip the test if the valac invocation on a
trivial program fails.
---

diff --git a/gettext-tools/tests/lang-vala b/gettext-tools/tests/lang-vala
index bf04f8edc..ba1d25e98 100755
--- a/gettext-tools/tests/lang-vala
+++ b/gettext-tools/tests/lang-vala
@@ -5,6 +5,29 @@
 # Assumes an fr_FR locale is installed.
 # Assumes the following packages are installed: vala.
 
+# Test for presence of valac.
+(valac --version) >/dev/null 2>/dev/null
+test $? -le 1 \
+  || { echo "Skipping test: valac not found"; Exit 77; }
+
+# Test whether valac can compile a trivial program.
+cat <<\EOF > prog.vala
+int main (string[] args) {
+    return 0;
+}
+EOF
+: ${VALAC=valac}
+${VALAC} prog.vala 2>prog.err \
+  || { 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
+         echo "Skipping test: valac installation does not work"
+         Exit 77
+       fi
+     }
+
 cat <<\EOF > prog.vala
 int main (string[] args) {
     Intl.setlocale (LocaleCategory.ALL, "");
@@ -16,19 +39,9 @@ int main (string[] args) {
 }
 EOF
 
-# Test for presence of valac.
-(valac --version) >/dev/null 2>/dev/null
-test $? -le 1 \
-  || { echo "Skipping test: valac not found"; Exit 77; }
-
 : ${VALAC=valac}
 ${VALAC} --Xcc=-DGETTEXT_PACKAGE=\"prog\" prog.vala 2>prog.err \
-  || { 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
-     }
+  || { cat prog.err 1>&2; Exit 1; }
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.vala || Exit 1