testrunner: Pass buildsystem's CC through to valac

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 57c95f9c87f3c703f3a72dd03a18c08fc57838d4..4ac9b94dc6677893b2a3256dc7857086b5f12b8b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,7 +17,7 @@ BUILT_SOURCES = \
 noinst_PROGRAMS = \
        $(NULL)
 
-TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' $(srcdir)/testrunner.sh
+TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' CC='$(CC)' $(srcdir)/testrunner.sh
 
 TESTS = \
        basic-types/integers.vala \
@@ -647,13 +647,13 @@ LINUX_TESTS = \
        $(NULL)
 
 check-TESTS: $(TESTS) $(NON_NULL_TESTS)
-       @EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' \
+       @EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' CC='$(CC)' \
                $(srcdir)/testrunner.sh $(TESTS)
 if HAVE_LINUX
-       @EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' \
+       @EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' CC='$(CC)' \
                VALAFLAGS="--pkg linux" $(srcdir)/testrunner.sh $(LINUX_TESTS)
 endif
-       @EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' \
+       @EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' CC='$(CC)' \
                VALAFLAGS="--enable-experimental-non-null" $(srcdir)/testrunner.sh $(NON_NULL_TESTS)
 
 EXTRA_DIST = \

diff --git a/tests/testrunner.sh b/tests/testrunner.sh
index f90cba7bcaf93c9c43b5ddadaebf037460aff4bd..129fff322faff6dc6ea299dd6627e991596452ab 100755 (executable)
--- a/tests/testrunner.sh
+++ b/tests/testrunner.sh
@@ -33,6 +33,7 @@ VALAFLAGS="$VALAFLAGS \
        --disable-warnings \
        --main main \
        --save-temps \
+       --cc $CC \
        -X -g \
        -X -O0 \
        -X -pipe \

diff --git a/valadoc/tests/Makefile.am b/valadoc/tests/Makefile.am
index f7cdf73f810ebd8c4d28f9f0ffc9d26bb7f5918b..e1fda6383fa6145b9f18836faea4d453e87e2bd4 100644 (file)
--- a/valadoc/tests/Makefile.am
+++ b/valadoc/tests/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.common
 NULL =
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) PACKAGE_SUFFIX=$(PACKAGE_SUFFIX) TOPBUILDDIR=$(abs_top_builddir) TOPSRCDIR=$(abs_top_srcdir) \
-       CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' $(srcdir)/testrunner.sh
+       CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' CC='$(CC)' $(srcdir)/testrunner.sh
 
 TESTS = \
        libvaladoc/errorreporter.vala \
@@ -18,7 +18,7 @@ TESTS = \
 
 check-TESTS: $(TESTS)
        @EXEEXT=$(EXEEXT) PACKAGE_SUFFIX=$(PACKAGE_SUFFIX) TOPBUILDDIR=$(abs_top_builddir) TOPSRCDIR=$(abs_top_srcdir) \
-               CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' $(srcdir)/testrunner.sh $(TESTS)
+               CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' CC='$(CC)' $(srcdir)/testrunner.sh $(TESTS)
        G_DEBUG=fatal_warnings $(builddir)/driver
 
 AM_CFLAGS = \

diff --git a/valadoc/tests/testrunner.sh b/valadoc/tests/testrunner.sh
index 60609f7570a225912465cb26552c7c227fb2bd3f..de45e4519ed3f5e16d33f22a8a515e46f887fc68 100755 (executable)
--- a/valadoc/tests/testrunner.sh
+++ b/valadoc/tests/testrunner.sh
@@ -38,6 +38,7 @@ VALAFLAGS="$VALAFLAGS \
        --disable-warnings \
        --main main \
        --save-temps \
+       --cc $CC \
        -X -g \
        -X -O0 \
        -X -pipe \