diff options
| author | Emanuele Aina <em@nerd.ocracy.org> | 2007-07-03 19:30:08 +0000 |
|---|---|---|
| committer | Emanuele Aina <em@nerd.ocracy.org> | 2007-07-03 19:30:08 +0000 |
| commit | 5716d5963bb82426346050d81fff7d77bac4f9ea (patch) | |
| tree | 16f430d5f32d4ce607d47eba7b60e586a947f6ca | |
| parent | 2a3e8870926a20d41426a54cccaa97617f9adf76 (diff) | |
| download | telepathy-salut-5716d5963bb82426346050d81fff7d77bac4f9ea.tar.gz | |
Do not use the internal copy of lcov if we cannot use the system one
The history has been edited and the internal copy of lcov introduced
in the "Add coverage and valgrind support for tests" patch has been
deleted. Yay for using textual patches to store the history!
20070703193008-f974e-d2322b04e4566dd2b12e5b6d15a35197343ffb9c.gz
| -rw-r--r-- | m4/salut-lcov.m4 | 7 | ||||
| -rw-r--r-- | rules/lcov.mak | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/m4/salut-lcov.m4 b/m4/salut-lcov.m4 index c0bbbf9c..cfd178f6 100644 --- a/m4/salut-lcov.m4 +++ b/m4/salut-lcov.m4 @@ -4,7 +4,7 @@ AC_DEFUN([SALUT_LCOV], [ enable=$1 - AC_PATH_PROG(LCOV_PATH, lcov) + AC_CHECK_PROGS(LCOV_PATH, lcov) if test -n "$LCOV_PATH" ; then AC_MSG_CHECKING([whether lcov accepts --compat-libtool]) @@ -18,10 +18,5 @@ AC_DEFUN([SALUT_LCOV], fi fi - if test -z "$LCOV_PATH" ; then - AC_MSG_WARN([will use an internal lcov copy]) - LCOV_PATH='$(top_srcdir)/scripts/lcov/lcov' - fi - AM_CONDITIONAL(HAVE_LCOV, test -n "$LCOV_PATH" && test "x$enable" = xyes) ]) diff --git a/rules/lcov.mak b/rules/lcov.mak index 7ceeaaeb..0e2e1d0e 100644 --- a/rules/lcov.mak +++ b/rules/lcov.mak @@ -17,6 +17,11 @@ lcov-run: # generate report based on current coverage data lcov-report: + @if test -z "$(LCOV_PATH)"; then \ + echo "WARNING: the 'lcov' executable was not found"; \ + echo "Use the \$$LCOV_PATH variable to set its location"; \ + exit 1; \ + fi @mkdir -p $(COVERAGE_DIR) @$(LCOV_PATH) --quiet --compat-libtool --directory . --capture --output-file $(COVERAGE_DIR)/lcov.info @$(LCOV_PATH) --quiet --compat-libtool -l $(COVERAGE_DIR)/lcov.info | grep -v "`cd $(top_srcdir) && pwd`" | cut -d: -f1 > $(COVERAGE_DIR)/remove |