diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-11-03 17:29:21 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-11-03 18:59:20 +0100 |
| commit | f08c9f7d1fa1df1d1fd6673785ca1764dc5c8046 (patch) | |
| tree | 08ee518f9590ab4d0a310c180ec1eba6300afda7 /valadoc | |
| parent | b083af081c7ecc4bb3f4e9544b30f4abce2560cf (diff) | |
| download | vala-f08c9f7d1fa1df1d1fd6673785ca1764dc5c8046.tar.gz | |
testrunner: Check if compiler flags are supported before using them
Use AX_CHECK_COMPILE_FLAG to collect TEST_CFLAGS in configure.
Diffstat (limited to 'valadoc')
| -rw-r--r-- | valadoc/tests/Makefile.am | 6 | ||||
| -rwxr-xr-x | valadoc/tests/testrunner.sh | 18 |
2 files changed, 8 insertions, 16 deletions
diff --git a/valadoc/tests/Makefile.am b/valadoc/tests/Makefile.am index 1c111295f..f7cdf73f8 100644 --- 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)' TEST_CFLAGS='$(TEST_CFLAGS)' $(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)' TEST_CFLAGS='$(TEST_CFLAGS)' $(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 34eb5ca2c..60609f757 100755 --- a/valadoc/tests/testrunner.sh +++ b/valadoc/tests/testrunner.sh @@ -42,20 +42,6 @@ VALAFLAGS="$VALAFLAGS \ -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 \ - -X -Wformat \ - -X -Werror=format-security \ - -X -Werror=format-nonliteral \ - -X -Werror=redundant-decls \ - -X -Werror=int-conversion \ -X -L$topbuilddir/vala/.libs -X -lvala$PACKAGE_SUFFIX \ -X -L$topbuilddir/libvaladoc/.libs -X -lvaladoc$PACKAGE_SUFFIX \ -X -I$topsrcdir/gee \ @@ -63,6 +49,10 @@ VALAFLAGS="$VALAFLAGS \ -X -I$topsrcdir/libvaladoc \ $topsrcdir/valadoc/tests/libvaladoc/parser/generic-scanner.vala" +# Incorporate the TEST_CFLAGS. +for cflag in ${TEST_CFLAGS}; do + VALAFLAGS="${VALAFLAGS} -X ${cflag}" +done # Incorporate the user's CFLAGS. Matters if the user decided to insert # -m32 in CFLAGS, for example. |