Commit ddcaf41f authored by Federico G. Schwindt's avatar Federico G. Schwindt

Revert "Enable optional lcov support"

This made gmake mandatory which is not ideal.  The code will be
fixed outside the tree and added back once it's free from any GNUism.
Discussed with dridi@.
parent 0cc4adf0
......@@ -112,9 +112,3 @@ cscope.*out
/bin/varnishtest/tests/*.log
/bin/varnishtest/tests/*.log-t
/bin/varnishtest/test-suite.log
# Code coverage with lcov/gcov
*.gcno
*.gcda
*.info
/lcov/
......@@ -25,17 +25,6 @@ distcleancheck_listfiles = \
find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
sh '{}' ';'
# lcov support
CODE_COVERAGE_OUTPUT_DIRECTORY = lcov
CODE_COVERAGE_IGNORE_PATTERN = "/usr/*"
CODE_COVERAGE_GENHTML_OPTIONS = --prefix $(abs_top_srcdir)
@CODE_COVERAGE_RULES@
if CODE_COVERAGE_ENABLED
lcov: check-code-coverage
endif
# XXX: This is a hack to ensure we have a built source tree when
# running make dist If we had used non-recursive make we could have
# solved it better, but we don't, so use this at least for now.
......
#!/bin/sh
#
# Use this when doing code development
#
# Arguments to this script are passed to the resulting ./configure execution.
# You may pass `--enable-code-coverage` to measure code coverage with lcov for
# example.
set -ex
......
......@@ -4,10 +4,6 @@ VTC_LOG_COMPILER = ./varnishtest -v -i
TEST_EXTENSIONS = .vtc
TESTS = @VTC_TESTS@
if CODE_COVERAGE_ENABLED
VTC_LOG_COMPILER += -p cli_timeout=120
endif
# Make sure we run check-local first
check: check-am check-local
check-am: check-local
......
......@@ -672,12 +672,6 @@ AC_SUBST(VTC_TESTS)
# Make sure this include dir exists
AC_CONFIG_COMMANDS([mkdir], [$MKDIR_P doc/sphinx/include])
# lcov support
AX_CODE_COVERAGE
CPPFLAGS="$CPPFLAGS \$(CODE_COVERAGE_CPPFLAGS)"
CFLAGS="$CFLAGS \$(CODE_COVERAGE_CFLAGS)"
LDFLAGS="$LDFLAGS \$(CODE_COVERAGE_LDFLAGS)"
# Generate output
AC_CONFIG_FILES([
Makefile
......
......@@ -88,7 +88,5 @@ main(void)
vbit_destroy(vb);
(void)obits; /* needed when NDEBUG is defined */
return (0);
}
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment