Browse Source

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

Nick Mathewson 5 years ago
parent
commit
2c5c17510a
3 changed files with 14 additions and 0 deletions
  1. 1 0
      .travis.yml
  2. 9 0
      Makefile.am
  3. 4 0
      changes/ticket28024

+ 1 - 0
.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.

+ 9 - 0
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)
 

+ 4 - 0
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.