commit ace98493bd8cc9b1227648bba29cb9686ecc4056 Merge: df444e482 2a33edc59 Author: teor teor@torproject.org Date: Fri Aug 10 13:28:19 2018 +1000

Merge branch 'travis-osx-034' into travis-osx-master

Replace master .travis.yml with 034 .travis.yml. All the changes in master have been backported to the 034 .travis.yml already.

Replace master src/test/test_rust.sh with 034 src/test/test_rust.sh, which was backported from master. One 033/034-specific commit needs to be reverted.

.travis.yml | 271 ++++++++++++++++++++++++------------------- changes/bug26497 | 3 + changes/bug26497-backport | 3 + changes/bug26497-cd | 4 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket24629-backport | 3 + changes/ticket26952-cargo | 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_rust/include.am | 2 - src/test/test_rust.sh | 7 +- 14 files changed, 188 insertions(+), 128 deletions(-)

diff --cc src/rust/tor_rust/include.am index ecc821a88,99f3ede65..ce673abbe --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@@ -7,18 -7,16 +7,16 @@@ EXTRA_CARGO_OPTIONS @TOR_RUST_LIB_PATH@: FORCE ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ - CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) build --release $(EXTRA_CARGO_OPTIONS) \ - $(CARGO_ONLINE) \ - --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) + $(CARGO_ONLINE) \ + --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" )

distclean-rust: ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ - CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) clean $(EXTRA_CARGO_OPTIONS) \ - $(CARGO_ONLINE) \ - --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) + $(CARGO_ONLINE) \ + --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) rm -rf "$(abs_top_builddir)/src/rust/registry"

if USE_RUST