diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-21 20:03:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-21 20:03:41 -0400 |
| commit | a29e9a901d196243791f9210be1fed1c177521df (patch) | |
| tree | 580b3e6073c4be57b1d58cd32a2b564e547625bc /src/test | |
| parent | d52f406001082474c3decf04747bf6f742b82c96 (diff) | |
| parent | e2eec40c4469c10dfb3006dfb07240d7e1144aa7 (diff) | |
| download | tor-a29e9a901d196243791f9210be1fed1c177521df.tar.gz tor-a29e9a901d196243791f9210be1fed1c177521df.zip | |
Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2
Diffstat (limited to 'src/test')
| -rwxr-xr-x | src/test/test_rust.sh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index d559f94ce0..2761b612b5 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -1,13 +1,18 @@ #!/bin/sh -# Test all the Rust crates we're using +# Test all Rust crates -crates=tor_util +set -e -exitcode=0 +export LSAN_OPTIONS=suppressions=${abs_top_srcdir:-../../..}/src/test/rust_supp.txt -for crate in $crates; do - cd "${abs_top_srcdir:-.}/src/rust/${crate}" - CARGO_TARGET_DIR="${abs_top_builddir}/src/rust/target" CARGO_HOME="${abs_top_builddir}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1 +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:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ + ${EXTRA_CARGO_OPTIONS} \ + --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 + fi done exit $exitcode |