tor

commit 11114c7e83161beb8adb47556ff437261498d618
parent fae525478370bb4834ac28fe06464a285b3d4a30
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 23 Mar 2018 11:18:47 -0400

Merge branch 'maint-0.3.3'

Diffstat:
A
changes/bug25560
 | 
5
+++++
M
src/test/include.am
 | 
2
+-
M
src/test/test_rust.sh
 | 
22
++++++++--------------

3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/changes/bug25560 b/changes/bug25560
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing, rust):
+    - Some of our Rust crates were not having their tests run with `make
+      test-rust` due to a static string in the `src/test/test_rust.sh` script
+      specifying which crates to test.  Rust crates are not automatically
+      detected and tested.  Fixes bug 25560; bugfix on 0.3.3.3-alpha.
diff --git a/src/test/include.am b/src/test/include.am
@@ -361,4 +361,4 @@ EXTRA_DIST += \
 	src/test/test_workqueue_socketpair.sh
 
 test-rust:
-	$(TESTS_ENVIRONMENT) $(abs_top_srcdir)/src/test/test_rust.sh
+	$(TESTS_ENVIRONMENT) "$(abs_top_srcdir)/src/test/test_rust.sh"
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
@@ -1,20 +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 $?