[patch] vala-0.12.1-multilib-tests.patch

vala-0.12.1-multilib-tests.patch (text/plain), 1.11 KB, created by Nathan Phillip Brink (binki) (RETIRED) on 2011-11-09 05:39:30 UTC

--- a/tests/testrunner.sh
+++ b/tests/testrunner.sh
@@ -31,6 +31,12 @@
 VALAC=$topbuilddir/compiler/valac
 VALAFLAGS="--vapidir $vapidir --disable-warnings --main main --save-temps -X -O0 -X -pipe -X -lm -X -Werror=return-type -X -Werror=init-self -X -Werror=implicit -X -Werror=sequence-point -X -Werror=return-type -X -Werror=uninitialized -X -Werror=pointer-arith -X -Werror=int-to-pointer-cast -X -Werror=pointer-to-int-cast"
 
+# Incorporate the user's CFLAGS. Matters if the user decided to insert
+# -m32 in CFLAGS, for example.
+for cflag in ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
+    VALAFLAGS="${VALAFLAGS} -X ${cflag}"
+done
+
 function testheader() {
 	if [ "$1" = "Packages:" ]; then
 		shift
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 444dcd4..ccc3cff 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,7 +12,7 @@ BUILT_SOURCES = \
 noinst_PROGRAMS = \
 	$(NULL)
 
-TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) $(srcdir)/testrunner.sh
+TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(srcdir)/testrunner.sh
 
 TESTS = \
 	basic-types/integers.vala \