nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/677'

Browse Source
This commit is contained in:
Nick Mathewson 2019-03-01 08:22:43 -05:00
commit cb0d403049
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes/ticket29064 Normal file
View File

@ -0,0 +1,2 @@
o Code simplification and refactoring (shell scripts):
- Fix shellcheck warning in test_rust.sh. Fixes issue 29064.

5
src/test/test_rust.sh
View File

@ -14,11 +14,12 @@ rustc_host=$(rustc -vV | grep host | sed 's/host: //')
for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do
if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then
# shellcheck disable=SC2086
cd "${abs_top_builddir:-../../..}/src/rust" && \ cd "${abs_top_builddir:-../../..}/src/rust" && \
CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
"${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ "${CARGO:-cargo}" test "${CARGO_ONLINE-'--frozen'}" \
--features "test_linking_hack" \ --features "test_linking_hack" \
--target $rustc_host \ --target "$rustc_host" \
${EXTRA_CARGO_OPTIONS} \ ${EXTRA_CARGO_OPTIONS} \
--manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1
fi fi