Commit 5227754b authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9

parents d465bd27 31865b50

.travis.yml

+3 −1
Original line number Diff line number Diff line
@@ -125,7 +125,9 @@ script: 


after_failure:

  ## `make check` will leave a log file with more details of test failures.

  - cat test-suite.log

  - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log; fi

  ## `make distcheck` puts it somewhere different.

  - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog; fi



after_success:

  ## If this build was one that produced coverage, upload it.

Makefile.am

+9 −0
Original line number Diff line number Diff line
@@ -216,3 +216,12 @@ mostlyclean-local: 
	rm -rf $(HTML_COVER_DIR)

	rm -rf $(top_builddir)/doc/doxygen

	rm -rf $(TEST_NETWORK_ALL_LOG_DIR)



# This relies on some internal details of how automake implements

# distcheck.  We check two directories because automake-1.15 changed

# from $(distdir)/_build to $(distdir)/_build/sub.

show-distdir-testlog:

	@if test -d "$(distdir)/_build/sub"; then \

	  cat $(distdir)/_build/sub/$(TEST_SUITE_LOG); \

	else \

	  cat $(distdir)/_build/$(TEST_SUITE_LOG); fi