commit 6e0be81211d7f9251231468c50b696aac2f8c9a1 Merge: 0f0dac0bf e1291aa84 Author: teor teor@torproject.org Date: Fri Aug 10 13:15:16 2018 +1000

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

Replace 034 .travis.yml with 033 .travis.yml. Subsequent commits will restore 034 functionality.

Replace 034 src/test/test_rust.sh with 033 src/test/test_rust.sh, which was backported from master.

.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/ticket26560 | 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 +- 15 files changed, 190 insertions(+), 129 deletions(-)

diff --cc src/rust/tor_rust/include.am index bcf94193f,40511bf9f..99f3ede65 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@@ -4,10 -4,9 +4,9 @@@ EXTRA_DIST +=

EXTRA_CARGO_OPTIONS=

-src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE +@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" )