testrunner: Pass buildsystem's CC through to valac

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 13542888968991f7e8df371a251619df0ee28f5a..55d599f67861da4109f75cf22eb254f45697d317 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)' $(srcdir)/testrunner.sh
+TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' CC='$(CC)' $(srcdir)/testrunner.sh
 
 TESTS = \
        basic-types/integers.vala \
@@ -656,11 +656,14 @@ LINUX_TESTS = \
        $(NULL)
 
 check-TESTS: $(TESTS) $(NON_NULL_TESTS)
-       @EXEEXT=$(EXEEXT) EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(srcdir)/testrunner.sh $(TESTS)
+       @EXEEXT=$(EXEEXT) EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' CC='$(CC)' \
+               $(srcdir)/testrunner.sh $(TESTS)
 if HAVE_LINUX
-       @EXEEXT=$(EXEEXT) EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' VALAFLAGS="--pkg linux" $(srcdir)/testrunner.sh $(LINUX_TESTS)
+       @EXEEXT=$(EXEEXT) EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' CC='$(CC)' \
+               VALAFLAGS="--pkg linux" $(srcdir)/testrunner.sh $(LINUX_TESTS)
 endif
-       @EXEEXT=$(EXEEXT) EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' VALAFLAGS="--enable-experimental-non-null" $(srcdir)/testrunner.sh $(NON_NULL_TESTS)
+       @EXEEXT=$(EXEEXT) EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' CC='$(CC)' \
+               VALAFLAGS="--enable-experimental-non-null" $(srcdir)/testrunner.sh $(NON_NULL_TESTS)
 
 EXTRA_DIST = \
        testrunner.sh \

diff --git a/tests/testrunner.sh b/tests/testrunner.sh
index 44fbd78cfe5a345c33ad9c15fabe8c3d7391fdf4..7426112d1eff0bc19828db4641a05f713e7b95b2 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 1c111295fb12188ca90f48635a0b471ade128fce..e40cc1ca31ed3e673448368569a4fd43f17e66b8 100644 (file)
--- a/valadoc/tests/Makefile.am
+++ b/valadoc/tests/Makefile.am
@@ -2,7 +2,8 @@ include $(top_srcdir)/Makefile.common
 
 NULL =
 
-TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) PACKAGE_SUFFIX=$(PACKAGE_SUFFIX) TOPBUILDDIR=$(abs_top_builddir) TOPSRCDIR=$(abs_top_srcdir) $(srcdir)/testrunner.sh
+TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) PACKAGE_SUFFIX=$(PACKAGE_SUFFIX) TOPBUILDDIR=$(abs_top_builddir) TOPSRCDIR=$(abs_top_srcdir) \
+       CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' CC='$(CC)' $(srcdir)/testrunner.sh
 
 TESTS = \
        libvaladoc/errorreporter.vala \
@@ -16,7 +17,8 @@ TESTS = \
        $(NULL)
 
 check-TESTS: $(TESTS)
-       @EXEEXT=$(EXEEXT) PACKAGE_SUFFIX=$(PACKAGE_SUFFIX) TOPBUILDDIR=$(abs_top_builddir) TOPSRCDIR=$(abs_top_srcdir) $(srcdir)/testrunner.sh $(TESTS)
+       @EXEEXT=$(EXEEXT) PACKAGE_SUFFIX=$(PACKAGE_SUFFIX) TOPBUILDDIR=$(abs_top_builddir) TOPSRCDIR=$(abs_top_srcdir) \
+               CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' 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 34eb5ca2cfa90e4fd7695da932a9b965929176c7..5ec5d1cbaf81c1ced9bc420f031fbfae256f4e6d 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 \