nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson 2018-05-03 13:38:37 -04:00
commit 5227754b2f
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -125,7 +125,9 @@ script:
after_failure: after_failure:
## `make check` will leave a log file with more details of test failures. ## `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: after_success:
## If this build was one that produced coverage, upload it. ## If this build was one that produced coverage, upload it.

9
Makefile.am
View File

@ -216,3 +216,12 @@ mostlyclean-local:
rm -rf $(HTML_COVER_DIR) rm -rf $(HTML_COVER_DIR)
rm -rf $(top_builddir)/doc/doxygen rm -rf $(top_builddir)/doc/doxygen
rm -rf $(TEST_NETWORK_ALL_LOG_DIR) 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