commit 11114c7e83161beb8adb47556ff437261498d618 Merge: fae525478 79d3f401a Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 23 11:18:47 2018 -0400
Merge branch 'maint-0.3.3'
changes/bug25560 | 5 +++++ src/test/include.am | 2 +- src/test/test_rust.sh | 22 ++++++++-------------- 3 files changed, 14 insertions(+), 15 deletions(-)
diff --cc src/test/test_rust.sh index 0268668b3,d87336e70..c35c57456 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@@ -1,20 -1,15 +1,14 @@@ #!/bin/sh # Test all Rust crates
- crates="protover tor_util smartlist tor_allocate" - - exitcode=0 - set -e
- for crate in $crates; do - cd "${abs_top_builddir:-../../..}/src/rust" - CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ - CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ - --manifest-path "${abs_top_srcdir:-.}/src/rust/${crate}/Cargo.toml" \ - || exitcode=1 - cd - - done + CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ + CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ + find "${abs_top_srcdir:-../../..}/src/rust" \ + -mindepth 2 -maxdepth 2 \ + -type f -name 'Cargo.toml' \ + -exec "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ + --manifest-path '{}' ;
- exit $exitcode + exit $? -