[tor-commits] [tor/maint-0.3.3] Merge branch 'bug25936-029' into bug25936-031

[nickm at torproject.org]

commit 59821050982a7e1c6906de61b6742546378e569c
Merge: bb35405d2 31865b502
Author: Taylor Yu <catalyst at torproject.org>
Date:   Thu Apr 26 15:46:57 2018 -0500

    Merge branch 'bug25936-029' into bug25936-031

 .travis.yml | 4 +++-
 Makefile.am | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 79d2e7852,f06d0e373..1a6d8e7d1
--- a/Makefile.am
+++ b/Makefile.am
@@@ -237,6 -217,11 +237,15 @@@ mostlyclean-local
  	rm -rf $(top_builddir)/doc/doxygen
  	rm -rf $(TEST_NETWORK_ALL_LOG_DIR)
  
 +clean-local:
 +	rm -rf $(top_builddir)/src/rust/target
 +	rm -rf $(top_builddir)/src/rust/.cargo/registry
++
+ # 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