diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-14 15:20:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-14 15:20:39 -0400 |
| commit | 2c5c17510acf0cbd0eeb874a2f4c62203bf9392f (patch) | |
| tree | 70aee5ab9d7edade0c4934cfb0bde6d5b4828c59 | |
| parent | 67351f672450d5f13754294405243a59ddd86de9 (diff) | |
| parent | 36ba506508ec5406be3d8c6a3b275fba069a7edf (diff) | |
| download | tor-2c5c17510acf0cbd0eeb874a2f4c62203bf9392f.tar.gz tor-2c5c17510acf0cbd0eeb874a2f4c62203bf9392f.zip | |
Merge remote-tracking branch 'tor-github/pr/402'
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | changes/ticket28024 | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 56d7dc0737..de526fe0f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -210,6 +210,7 @@ after_failure: - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi + - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi after_success: ## If this build was one that produced coverage, upload it. diff --git a/Makefile.am b/Makefile.am index a0f513c75e..e5c1be31b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -452,6 +452,15 @@ show-distdir-testlog: else \ 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: @echo $(TOR_INTERNAL_LIBS) diff --git a/changes/ticket28024 b/changes/ticket28024 new file mode 100644 index 0000000000..4b39523085 --- /dev/null +++ b/changes/ticket28024 @@ -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. |