From: Nathan Phillip Brink <binki@gentoo.org>
Date: Wed, 23 Nov 2011 02:57:23 +0000 (+0000)
Subject: tests: Honor CFLAGS, LDFLAGS, and CPPFLAGS
X-Git-Tag: 0.15.2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=224a2fcb750aca13e917b3319dc8985ce5fde2e9;p=thirdparty%2Fvala.git

tests: Honor CFLAGS, LDFLAGS, and CPPFLAGS

Fixes bug 664606.
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 119f1f836..c5248d36d 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 \
@@ -168,7 +168,7 @@ TESTS = \
 	$(NULL)
 
 check-TESTS: $(TESTS)
-	@EXEEXT=$(EXEEXT) $(srcdir)/testrunner.sh $(TESTS)
+	@EXEEXT=$(EXEEXT) EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(srcdir)/testrunner.sh $(TESTS)
 
 EXTRA_DIST = \
 	testrunner.sh \
diff --git a/tests/testrunner.sh b/tests/testrunner.sh
index adb20d6d5..02948c1a8 100755
--- a/tests/testrunner.sh
+++ b/tests/testrunner.sh
@@ -33,6 +33,12 @@ VALAFLAGS="--vapidir $vapidir --disable-warnings --main main --save-temps -X -g
 VAPIGEN=$topbuilddir/vapigen/vapigen
 VAPIGENFLAGS="--vapidir $vapidir"
 
+# 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