diff options
| author | teor <teor@torproject.org> | 2018-08-10 13:28:19 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-10 13:28:19 +1000 |
| commit | ace98493bd8cc9b1227648bba29cb9686ecc4056 (patch) | |
| tree | 948c4050bf8f54c47cfdad2d945732ba165227c8 /src/test/test_rust.sh | |
| parent | df444e482bc083b4c4239b8fb4d532ebffaae5a8 (diff) | |
| parent | 2a33edc595a619d6c2abcb260195f92d97192d6a (diff) | |
| download | tor-ace98493bd8cc9b1227648bba29cb9686ecc4056.tar.gz tor-ace98493bd8cc9b1227648bba29cb9686ecc4056.zip | |
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.
Diffstat (limited to 'src/test/test_rust.sh')
| -rwxr-xr-x | src/test/test_rust.sh | 7 |
1 files changed, 3 insertions, 4 deletions
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 |