From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 23 Mar 2018 15:18:47 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3'
X-Git-Tag: tor-0.3.4.1-alpha~217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11114c7e83161beb8adb47556ff437261498d618;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3'
---

11114c7e83161beb8adb47556ff437261498d618
diff --cc src/test/test_rust.sh
index 0268668b3d,d87336e700..c35c57456f
--- 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 $?
 -