diff options
| author | William A. Kennington III <wak@google.com> | 2018-06-27 11:19:21 -0700 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-07-18 21:46:01 +0000 |
| commit | 0db800773e6b690a95a11ab4a79d77337f21bf12 (patch) | |
| tree | 3f2c565fc199a8efabe9b48358b4677fa5ffe31e | |
| parent | daa800e3bd1a4f464bfbe3b8ce34901a0a848cfd (diff) | |
| download | sdbusplus-0db800773e6b690a95a11ab4a79d77337f21bf12.tar.gz sdbusplus-0db800773e6b690a95a11ab4a79d77337f21bf12.zip | |
configure: Don't check for valgrind or coverage without tests
If we don't have test cases enabled we can't possibly need code coverage
or valgrind support since that is only used by our test cases.
Tested:
Builds still work as expected and the autodetection of tests still
enables valgrind if it is available. Code coverage is only available
if `--disable-tests` is not passed and `--enable-code-coverage` is
passed.
Change-Id: I8bc786f2d64944ff8939b66055b3f850f6be7f6f
Signed-off-by: William A. Kennington III <wak@google.com>
| -rw-r--r-- | configure.ac | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index ed927d4..6c39d32 100644 --- a/configure.ac +++ b/configure.ac @@ -10,12 +10,14 @@ AM_SILENT_RULES([yes]) # Make sure the default CFLAGS of `-O2 -g` don't override CODE_COVERAGE_CFLAGS # It is important that this comes before AC_PROG_C{C,XX}, as we are attempting # to stop them from populating default CFLAGS and CXXFLAGS. -AS_IF([test "x$enable_code_coverage" != "xno"], [ - AS_IF([test "x${CXXFLAGS+set}" != "xset"], [ - AC_SUBST(CXXFLAGS, [""]) - ]) - AS_IF([test "x${CFLAGS+set}" != "xset"], [ - AC_SUBST(CFLAGS, [""]) +AS_IF([test "$enable_testing" != "xno"], [ + AS_IF([test "x$enable_code_coverage" = "xyes"], [ + AS_IF([test "x${CXXFLAGS+set}" != "xset"], [ + AC_SUBST(CXXFLAGS, [""]) + ]) + AS_IF([test "x${CFLAGS+set}" != "xset"], [ + AC_SUBST(CFLAGS, [""]) + ]) ]) ]) @@ -145,17 +147,21 @@ AS_IF([test "x$enable_tests" != "xno"], [ ]) # Check for valgrind -m4_foreach([vgtool], [valgrind_tool_list], - [AX_VALGRIND_DFLT(vgtool, [off])]) -AX_VALGRIND_DFLT([memcheck], [on]) -AX_VALGRIND_CHECK -AM_EXTRA_RECURSIVE_TARGETS([check-valgrind]) -m4_foreach([vgtool], [valgrind_tool_list], - [AM_EXTRA_RECURSIVE_TARGETS([check-valgrind-]vgtool)]) +AS_IF([test "x$enable_tests" != "xno"], [ + m4_foreach([vgtool], [valgrind_tool_list], + [AX_VALGRIND_DFLT(vgtool, [off])]) + AX_VALGRIND_DFLT([memcheck], [on]) + AX_VALGRIND_CHECK + AM_EXTRA_RECURSIVE_TARGETS([check-valgrind]) + m4_foreach([vgtool], [valgrind_tool_list], + [AM_EXTRA_RECURSIVE_TARGETS([check-valgrind-]vgtool)]) +]) # Code coverage -AX_CODE_COVERAGE -AM_EXTRA_RECURSIVE_TARGETS([check-code-coverage]) +AS_IF([test "x$enable_tests" != "xno"], [ + AX_CODE_COVERAGE + AM_EXTRA_RECURSIVE_TARGETS([check-code-coverage]) +]) AC_ARG_ENABLE([oe-sdk], AS_HELP_STRING([--enable-oe-sdk], [Link testcases absolutely against OE SDK so they can be ran within it.]) |
