May 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.3] Merge branch 'bug25936-032' into bug25936-033
by nickm＠torproject.org 03 May '18

03 May '18

commit f0dc6c8e2a68764b73ea4b3fdb50f74b070c183b Merge: 58f54a358 2edc9cd48 Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Apr 26 16:07:56 2018 -0500 Merge branch 'bug25936-032' into bug25936-033 .travis.yml | 4 +++- Makefile.am | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc Makefile.am index 04ca88a23,4d2d9d222..08cb8e3e7 --- a/Makefile.am +++ b/Makefile.am @@@ -250,7 -248,11 +250,15 @@@ clean-local rm -rf $(top_builddir)/src/rust/target rm -rf $(top_builddir)/src/rust/.cargo/registry +if USE_RUST +distclean-local: distclean-rust +endif + + # 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

1 0

[tor/release-0.3.3] Merge branch 'bug25936-029' into bug25936-031
by nickm＠torproject.org 03 May '18

03 May '18

commit 59821050982a7e1c6906de61b6742546378e569c Merge: bb35405d2 31865b502 Author: Taylor Yu <catalyst(a)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

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9
by nickm＠torproject.org 03 May '18

03 May '18

commit 5227754b2f441c93da6436697a19841e9e71246f Merge: d465bd27e 31865b502 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 13:38:37 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9 .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1
by nickm＠torproject.org 03 May '18

03 May '18

commit 726f238b723dfaa88df763bec7e923e99430ea87 Merge: 993e314c6 598210509 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 13:38:46 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1 .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 03 May '18

03 May '18

commit 6361a250f08421aa1e6db1093aaa488ee24ce77d Merge: 726f238b7 5227754b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 03 May '18

03 May '18

commit 4c6a407b9d9436948dbbecffde32e28380240728 Merge: 44626b37f be5b4415c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'catalyst-github/bug25936-033' into maint-0.3.3
by nickm＠torproject.org 03 May '18

03 May '18

commit 44626b37f6c6bcc1907cd269b8e9bc77909f9d51 Merge: 1bbe75da6 f0dc6c8e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 13:38:51 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25936-033' into maint-0.3.3 .travis.yml | 4 +++- Makefile.am | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 03 May '18

03 May '18

commit 40456054eadf8a002de66d25cdf1400764a9f8af Merge: f6890422a 4c6a407b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 4 +++- Makefile.am | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 03 May '18

03 May '18

commit be5b4415c2dce243a6249e6ca14b65423c9b0746 Merge: 246765342 6361a250f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.9] Show test-suite.log for distcheck on Travis CI
by nickm＠torproject.org 03 May '18

03 May '18

commit 31865b50295753706ff3a9eb598e080bb2167639 Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Apr 26 14:22:52 2018 -0500 Show test-suite.log for distcheck on Travis CI When Travis CI runs make distcheck, test-suite.log doesn't exist in the expected place. Add a new make target to show this file and use it when DISTCHECK=yes in .travis.yml. Fixes bug 25814; bug not in any released Tor. --- .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6da3027b8..6a3e1bfc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,7 +125,9 @@ script: after_failure: ## `make check` will leave a log file with more details of test failures. - - cat test-suite.log + - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log; fi + ## `make distcheck` puts it somewhere different. + - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog; fi after_success: ## If this build was one that produced coverage, upload it. diff --git a/Makefile.am b/Makefile.am index f400728ba..f06d0e373 100644 --- a/Makefile.am +++ b/Makefile.am @@ -216,3 +216,12 @@ mostlyclean-local: rm -rf $(HTML_COVER_DIR) rm -rf $(top_builddir)/doc/doxygen rm -rf $(TEST_NETWORK_ALL_LOG_DIR) + +# 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

1 0