nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/402'

Browse Source
This commit is contained in:
Nick Mathewson 2018-10-14 15:20:39 -04:00
commit 2c5c17510a
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -210,6 +210,7 @@ after_failure:
- if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi
## `make distcheck` puts it somewhere different. ## `make distcheck` puts it somewhere different.
- if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi
- if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; 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

@ -452,6 +452,15 @@ show-distdir-testlog:
else \ else \
cat $(distdir)/_build/$(TEST_SUITE_LOG); fi cat $(distdir)/_build/$(TEST_SUITE_LOG); fi
# Similarly, this relies on automake internals to run file on an
# intermittent core file whose provenance is not known to us. See
# ticket 26787.
show-distdir-core:
@if test -d "$(distdir)/_build/sub"; then \
file $(distdir)/_build/sub/core ; \
else \
file $(distdir)/_build/core; fi
show-libs: show-libs:
@echo $(TOR_INTERNAL_LIBS) @echo $(TOR_INTERNAL_LIBS)

4
changes/ticket28024 Normal file
View File

@ -0,0 +1,4 @@
o Minor features (testing):
- Report what program produced the mysterious core file that we
occasionally see on Travis CI during make distcheck. Closes
ticket 28024.