diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/include.am | 1 | ||||
| -rwxr-xr-x | src/test/test_rust.sh | 14 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/test/include.am b/src/test/include.am index b768f74475..cc4f3e5c88 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -9,6 +9,7 @@ TESTS_ENVIRONMENT = \ export builddir="$(builddir)"; \ export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; \ export CARGO="$(CARGO)"; \ + export EXTRA_CARGO_OPTIONS="$(EXTRA_CARGO_OPTIONS)"; \ export CARGO_ONLINE="$(CARGO_ONLINE)"; TESTSCRIPTS = \ diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 854582ec17..8e8d29b895 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -4,11 +4,15 @@ set -e -for cargo_toml in "${abs_top_srcdir:-../../..}"/src/rust/*/Cargo.toml; do - 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 "$cargo_toml" || 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_HOME="${abs_top_builddir:-../../..}/src/rust" \ + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE:-"--frozen"} \ + ${EXTRA_CARGO_OPTIONS} \ + --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 + fi done exit $exitcode |