Merge pull request #63 from openweave/bug/github-61

Address make coverage with build jobs > 1 results in duplicative weave unit test output issue.

Author: gerickson

Makefile.am

@@ -206,7 +206,7 @@ DISTCHECK_CONFIGURE_FLAGS = `chmod u+w .. ../third_party`
 
 DISTCHECK_CONFIGURE_FLAGS += --without-bluez --without-happy
 
-dist distcheck distdir install-headers: $(BUILT_SOURCES)
+all-recursive check-recursive coverage-recursive install-recursive pretty-recursive pretty-check-recursive dist distcheck distdir install-headers: $(BUILT_SOURCES)
 
 dist-hook: $(distdir)/.dist-version
 

Makefile.in

@@ -1225,7 +1225,7 @@ $(distdir)/.dist-version: $(builddir)/.local-version force
 $(distdir)/.dist-version $(builddir)/.local-version:
 	$(call check-file,$(@F))
 
-dist distcheck distdir install-headers: $(BUILT_SOURCES)
+all-recursive check-recursive coverage-recursive install-recursive pretty-recursive pretty-check-recursive dist distcheck distdir install-headers: $(BUILT_SOURCES)
 
 dist-hook: $(distdir)/.dist-version
 

src/test-apps/Makefile.am

@@ -359,9 +359,9 @@ endif
 
 check_PROGRAMS +=                                \
     TestTDM                                      \
-	TestPathStore                                \
-	TestWdmUpdateEncoder                         \
-	TestWdmUpdateResponse                        \
+    TestPathStore                                \
+    TestWdmUpdateEncoder                         \
+    TestWdmUpdateResponse                        \
     $(NULL)
 
 if WEAVE_BUILD_WARM
@@ -402,7 +402,6 @@ check_SCRIPTS                                 += \
     $(NULL)
 endif # WEAVE_WITH_JAVA
 
-
 # Test applications that should be built but not installed that
 # require no network or complicated setup and should always be
 # built to ensure overall "build sanity".
@@ -1596,7 +1595,7 @@ $(WEAVE_LIBS_COVERAGE_SOURCE):
 $(WEAVE_LIBS_COVERAGE_BUNDLE):
 	$(call create-directory)
 
-$(WEAVE_COVERAGE_INFO): check | $(WEAVE_COVERAGE_BUNDLE)
+$(WEAVE_COVERAGE_INFO): check-local | $(WEAVE_COVERAGE_BUNDLE)
 	$(call generate-coverage-report,${abs_top_builddir})
 
 # collect all the *.gcno & *gcda files of libWeave.a for Weave Library coverage analysis, rename the *h file paths to make it a clean report
@@ -1618,7 +1617,7 @@ $(WEAVE_LIBS_COVERAGE_INFO): $(WEAVE_COVERAGE_INFO) | $(WEAVE_LIBS_COVERAGE_BUND
 	$(NL_V_GENHTML)$(GENHTML) $(NL_V_GENHTML_FLAGS) --config-file="$(abs_top_nlbuild_autotools_dir)/etc/lcov.config" $(WEAVE_LIBS_COVERAGE_INFO).clean --output-directory $(WEAVE_LIBS_COVERAGE_BUNDLE)
 	$(AM_V_at)rm -rf $(WEAVE_LIBS_COVERAGE_SOURCE)
 
-coverage: $(WEAVE_LIBS_COVERAGE_INFO)
+coverage-local: $(WEAVE_LIBS_COVERAGE_INFO)
 
 clean-local: clean-local-coverage
 

src/test-apps/Makefile.in

@@ -8507,10 +8507,10 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@WEAVE_BUILD_TESTS_FALSE@uninstall-local:
 @WEAVE_BUILD_COVERAGE_FALSE@clean-local:
 @WEAVE_BUILD_COVERAGE_REPORTS_FALSE@clean-local:
 @WEAVE_BUILD_TESTS_FALSE@clean-local:
+@WEAVE_BUILD_TESTS_FALSE@uninstall-local:
 @WEAVE_BUILD_TESTS_FALSE@install-exec-local:
 clean: clean-recursive
 
@@ -8693,7 +8693,7 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
 @WEAVE_BUILD_COVERAGE_REPORTS_TRUE@@WEAVE_BUILD_COVERAGE_TRUE@@WEAVE_BUILD_TESTS_TRUE@$(WEAVE_LIBS_COVERAGE_BUNDLE):
 @WEAVE_BUILD_COVERAGE_REPORTS_TRUE@@WEAVE_BUILD_COVERAGE_TRUE@@WEAVE_BUILD_TESTS_TRUE@	$(call create-directory)
 
-@WEAVE_BUILD_COVERAGE_REPORTS_TRUE@@WEAVE_BUILD_COVERAGE_TRUE@@WEAVE_BUILD_TESTS_TRUE@$(WEAVE_COVERAGE_INFO): check | $(WEAVE_COVERAGE_BUNDLE)
+@WEAVE_BUILD_COVERAGE_REPORTS_TRUE@@WEAVE_BUILD_COVERAGE_TRUE@@WEAVE_BUILD_TESTS_TRUE@$(WEAVE_COVERAGE_INFO): check-local | $(WEAVE_COVERAGE_BUNDLE)
 @WEAVE_BUILD_COVERAGE_REPORTS_TRUE@@WEAVE_BUILD_COVERAGE_TRUE@@WEAVE_BUILD_TESTS_TRUE@	$(call generate-coverage-report,${abs_top_builddir})
 
 # collect all the *.gcno & *gcda files of libWeave.a for Weave Library coverage analysis, rename the *h file paths to make it a clean report
@@ -8715,7 +8715,7 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
 @WEAVE_BUILD_COVERAGE_REPORTS_TRUE@@WEAVE_BUILD_COVERAGE_TRUE@@WEAVE_BUILD_TESTS_TRUE@	$(NL_V_GENHTML)$(GENHTML) $(NL_V_GENHTML_FLAGS) --config-file="$(abs_top_nlbuild_autotools_dir)/etc/lcov.config" $(WEAVE_LIBS_COVERAGE_INFO).clean --output-directory $(WEAVE_LIBS_COVERAGE_BUNDLE)
 @WEAVE_BUILD_COVERAGE_REPORTS_TRUE@@WEAVE_BUILD_COVERAGE_TRUE@@WEAVE_BUILD_TESTS_TRUE@	$(AM_V_at)rm -rf $(WEAVE_LIBS_COVERAGE_SOURCE)
 
-@WEAVE_BUILD_COVERAGE_REPORTS_TRUE@@WEAVE_BUILD_COVERAGE_TRUE@@WEAVE_BUILD_TESTS_TRUE@coverage: $(WEAVE_LIBS_COVERAGE_INFO)
+@WEAVE_BUILD_COVERAGE_REPORTS_TRUE@@WEAVE_BUILD_COVERAGE_TRUE@@WEAVE_BUILD_TESTS_TRUE@coverage-local: $(WEAVE_LIBS_COVERAGE_INFO)
 
 @WEAVE_BUILD_COVERAGE_REPORTS_TRUE@@WEAVE_BUILD_COVERAGE_TRUE@@WEAVE_BUILD_TESTS_TRUE@clean-local: clean-local-coverage
 

third_party/nlbuild-autotools/repo/.default-version

@@ -1 +1 @@
-1.6.2
+1.6.3

third_party/nlbuild-autotools/repo/CHANGES

@@ -1,3 +1,8 @@
+1.6.3 (2018-10-19)
+
+        * Added support for coverage-local and check-local targets. Added
+          documentation for all coverage-related targets.
+
 1.6.2 (2018-10-09)
 
         * Take a different approach to version flapping against 'make

third_party/nlbuild-autotools/repo/automake/post/rules/coverage.am

@@ -1,4 +1,5 @@
 #
+#    Copyright 2018 Google LLC. All Rights Reserved.
 #    Copyright 2015-2016 Nest Labs Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,9 +27,40 @@
 #      invocations. The 'check-am' and '$(BUILT_SOURCES)' are the key
 #      automake-specific dependencies to ensure that happens.
 #
+#      This defines the following make targets:
+#
+#        coverage:
+#          Execute local and recursive coverage targets across the
+#          project sub-tree at the current invocation point.
+#
+#          This target is intended to be user-visibile and -invoked.
+#
+#        coverage-local:
+#          Execute local coverage targets at the current invocation point.
+#
+#          This target is intended to be user-visibile and -invoked.
+#
+#        coverage-recursive:
+#          Recursively execute the 'coverage' target across the
+#          project sub-tree at the current invocation point.
+#
+#          This target is NOT intended to be user-visibile and -invoked.
+#
+#        check-local:
+#          Alias for the 'check-am' target. Execute local check
+#          targets at the current invocation point. Local coverage targets
+#          may depend on this to ensure local tests are made before
+#          coverage targets are made.
+#
+#          This target is intended to be user-visibile and -invoked.
+#
+
+.PHONY: coverage coverage-recursive coverage-local check-local
+
+check-local: check-am
+
+coverage: coverage-local
 
-.PHONY: coverage coverage-recursive
- 
 coverage: coverage-recursive
 
 coverage: check-am