tor

commit 2c5c17510acf0cbd0eeb874a2f4c62203bf9392f
parent 67351f672450d5f13754294405243a59ddd86de9
Author: Nick Mathewson <nickm@torproject.org>
Date:   Sun, 14 Oct 2018 15:20:39 -0400

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

Diffstat:
M
.travis.yml
 | 
1
+
M
Makefile.am
 | 
9
+++++++++
A
changes/ticket28024
 | 
4
++++

3 files changed, 14 insertions(+), 0 deletions(-)
diff --git 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
@@ -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
@@ -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.