mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 04:13:28 +01:00
Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3
This commit is contained in:
commit
71065201dd
4
changes/bug26258_033
Normal file
4
changes/bug26258_033
Normal file
@ -0,0 +1,4 @@
|
||||
o Major bugfixes (rust, testing):
|
||||
- Fix a bug where a failure in the rust unit tests would not actually
|
||||
cause the build to fail. Fixes bug 26258; bugfix on 0.3.3.4-alpha.
|
||||
|
@ -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 = \
|
||||
|
@ -3,13 +3,18 @@
|
||||
|
||||
set -e
|
||||
|
||||
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 $?
|
||||
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
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user