diff options
| author | teor <teor@torproject.org> | 2018-08-10 11:43:17 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-10 11:43:17 +1000 |
| commit | 2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27 (patch) | |
| tree | af016c6f7efef8246ccabc1c3f8db03ed96050a5 /src/test | |
| parent | c4d0d9bd24c484893055d50999377f86fd9468c7 (diff) | |
| parent | 4517c4c3e38fe93d668ab84dc5e7cb3bd0a3c173 (diff) | |
| download | tor-2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27.tar.gz tor-2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27.zip | |
Merge branch 'travis-osx-032' into travis-osx-033
Replace 033 .travis.yml with 032 .travis.yml.
Subsequent commits will restore 033 functionality.
src/rust/tor_util/include.am is deleted in 033.
Subsequent commits will apply 032 changes to
src/rust/tor_rust/include.am.
Replace 033 src/test/test_rust.sh with 032
src/test/test_rust.sh, which was backported from
master.
Diffstat (limited to 'src/test')
| -rwxr-xr-x | src/test/test_rust.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index c7d0439ad1..2761b612b5 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -3,18 +3,16 @@ set -e +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}" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ - CARGO_HOME="${abs_top_builddir:-../../..}/src/rust/.cargo" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ + "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi done exit $exitcode - - |