tests: Honor CFLAGS, LDFLAGS, and CPPFLAGS

Fixes bug 664606.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 119f1f836dcca4ba1f2db0c31f9bfb132a62eff4..c5248d36df340866be65a266a75ea28e15e4a8b3 100644 (file)
--- 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 adb20d6d5e63d8996c9b0bd11f2561f09297bc08..02948c1a835806c2c186ae568d12d06cb80b70ea 100755 (executable)
--- 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