diff options
| author | Philip Chimento <philip@endlessm.com> | 2015-08-25 15:21:08 -0700 |
|---|---|---|
| committer | Philip Chimento <philip@endlessm.com> | 2015-08-26 09:28:56 -0700 |
| commit | 2498e99b87fe0b131c2288eae0c9a7379b850148 (patch) | |
| tree | 9bf9c72f763fbe4bb8e423395b1be406397a2121 /m4 | |
| parent | 8bbad1b7fdfb1d0fdc4dba3f824692c5ed53d67a (diff) | |
Process --with-coverage-dir flag even without coverage
Even if coverage is not requested, it is still turned on during "make
distcheck". In that case, any --with-coverage-dir flag passed to configure
should be respected.
In general, it's good practice not to let the _presence_ of a configure
flag depend on the value of another configure flag; only the actions taken
as a result of that flag.
[endlessm/eos-sdk#3540]
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/eos-coverage.m4 | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/m4/eos-coverage.m4 b/m4/eos-coverage.m4 index 0adb4d0..31b18e8 100644 --- a/m4/eos-coverage.m4 +++ b/m4/eos-coverage.m4 @@ -86,6 +86,21 @@ AC_DEFUN_ONCE([EOS_COVERAGE_REPORT], [ ]) AC_MSG_RESULT([$EOS_COVERAGE_REQUESTED]) + AC_MSG_CHECKING([where to put coverage data]) + EOS_DEFAULT_COVERAGE_DIR='$(abs_top_builddir)/_coverage' + AC_ARG_WITH([coverage-dir], [ + AS_HELP_STRING([--with-coverage-dir=DIRECTORY], + [Where to put coverage reports @<:@default=_coverage@:>@]) + ], [ + EOS_COVERAGE_DIR="$withval" + ]) + AS_IF([test -z "$EOS_COVERAGE_DIR"], [ + EOS_COVERAGE_DIR="$EOS_DEFAULT_COVERAGE_DIR" + AC_MSG_RESULT([in default location (_coverage)]) + ], [ + AC_MSG_RESULT([in $EOS_COVERAGE_DIR]) + ]) + AS_IF([test "x$EOS_COVERAGE_REQUESTED" = "xyes"], [ # Need LCOV to do coverage report filtering. If we don't have it @@ -128,21 +143,6 @@ AC_DEFUN_ONCE([EOS_COVERAGE_REPORT], [ ]) ]) - AC_MSG_CHECKING([where to put coverage data]) - EOS_DEFAULT_COVERAGE_DIR='$(abs_top_builddir)/_coverage' - AC_ARG_WITH([coverage-dir], [ - AS_HELP_STRING([--with-coverage-dir=DIRECTORY], - [Where to put coverage reports @<:@default=_coverage@:>@]) - ], [ - EOS_COVERAGE_DIR="$withval" - ]) - AS_IF([test -z "$EOS_COVERAGE_DIR"], [ - EOS_COVERAGE_DIR="$EOS_DEFAULT_COVERAGE_DIR" - AC_MSG_RESULT([in default location (_coverage)]) - ], [ - AC_MSG_RESULT([in $EOS_COVERAGE_DIR]) - ]) - AS_IF([test "x$EOS_HAVE_C_COVERAGE" = "xyes" || test "x$EOS_HAVE_JS_COVERAGE" = "xyes"], [ AC_PATH_PROG([GENHTML], [genhtml], [notfound]) AC_ARG_VAR([GENHTML], [Path to genhtml]) |