diff options
| author | teor <teor@torproject.org> | 2018-08-10 13:15:16 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-10 13:15:16 +1000 |
| commit | 6e0be81211d7f9251231468c50b696aac2f8c9a1 (patch) | |
| tree | 00ccb5654a44467f365c8af86414fd7307159f2d /src | |
| parent | 0f0dac0bfcfc357a87c3d275e9846bdfca946877 (diff) | |
| parent | e1291aa84a04b8006130ce08338ee07a662e5ce0 (diff) | |
| download | tor-6e0be81211d7f9251231468c50b696aac2f8c9a1.tar.gz tor-6e0be81211d7f9251231468c50b696aac2f8c9a1.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rust/tor_rust/include.am | 2 | ||||
| -rwxr-xr-x | src/test/test_rust.sh | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index bcf94193f4..99f3ede653 100644 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@ -7,7 +7,6 @@ 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" ) @@ -15,7 +14,6 @@ EXTRA_CARGO_OPTIONS= 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" ) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 4ecca7834d..5405af436b 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -3,14 +3,13 @@ set -e -export LSAN_OPTIONS=suppressions=${abs_top_srcdir}/src/test/rust_supp.txt +export LSAN_OPTIONS=suppressions=${abs_top_srcdir:-../../..}/src/test/rust_supp.txt for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then - cd "${cargo_toml_dir}" && \ + cd "${abs_top_builddir:-../../..}/src/rust" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ - CARGO_HOME="${abs_top_builddir:-../../..}/src/rust/.cargo" \ - "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi |