summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2015-07-25 03:20:23 +0800
committerSam Spilsbury <smspillaz@gmail.com>2015-07-25 11:50:58 +0800
commit87bf507ea1527804fb9f1d5dbb299e0604e3b55f (patch)
treef1802d38176c0160a20107bace50ebf8827cfed7
parent9882672eb11b1b5631518aa9d400b02d2efd7391 (diff)
eos-coverage.m4: Forward coverage flags to distcheck
If we passed --enable-coverage to configure, then we probably want it for distcheck as well. Otherwise we run the risk of copying the run_coverage.coverage script over which has commands configured for the parent build, but not the distcheck build. [endlessm/eos-sdk#3303]
-rw-r--r--m4/eos-coverage.m46
1 files changed, 5 insertions, 1 deletions
diff --git a/m4/eos-coverage.m4 b/m4/eos-coverage.m4
index df9ea67..f2672dc 100644
--- a/m4/eos-coverage.m4
+++ b/m4/eos-coverage.m4
@@ -414,6 +414,10 @@ run_coverage.coverage:
clean-local: clean-coverage
'
+ EOS_DISTCHECK_CONFIGURE_FLAGS_RULES="
+DISTCHECK_CONFIGURE_FLAGS += --enable-coverage --with-coverage-dir=$EOS_COVERAGE_DIR
+ "
+
EOS_COVERAGE_RULES_FOOTER='
run_coverage.log: $(filter-out run_coverage.log,$(TEST_LOGS))
@@ -422,7 +426,7 @@ CLEANFILES += run_coverage.coverage
.PHONY: eos-clean-c-coverage eos-c-coverage clean-coverage eos-collect-coverage coverage-cobertura coverage-genhtml
'
- EOS_COVERAGE_RULES="$EOS_COVERAGE_RULES_HEADER $EOS_GENHTML_COVERAGE_RULES $EOS_COBERTURA_COVERAGE_RULES $EOS_C_COVERAGE_RULES $EOS_JS_COVERAGE_RULES $EOS_COVERAGE_RULES_TARGETS $EOS_COVERAGE_AUTORUN_GENERATED_TARGET $EOS_COVERAGE_RULES_FOOTER"
+ EOS_COVERAGE_RULES="$EOS_COVERAGE_RULES_HEADER $EOS_GENHTML_COVERAGE_RULES $EOS_COBERTURA_COVERAGE_RULES $EOS_C_COVERAGE_RULES $EOS_JS_COVERAGE_RULES $EOS_COVERAGE_RULES_TARGETS $EOS_COVERAGE_AUTORUN_GENERATED_TARGET $EOS_DISTCHECK_CONFIGURE_FLAGS_RULES $EOS_COVERAGE_RULES_FOOTER"
# Substitute at the top first
AC_SUBST([EOS_COVERAGE_DIR])