diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-03-01 08:22:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-03-01 08:22:43 -0500 |
| commit | cb0d40304968735db5e85fc81e451a149bf05cc0 (patch) | |
| tree | edd624084168e23c3a4d72c8bd9c26dfc218078d /src | |
| parent | 2d5c6cddc434cb04ca8a1ce1f2922d6f639d229a (diff) | |
| parent | ad48aab0565e8498fd68428fb2cfaa46b39ffc01 (diff) | |
| download | tor-cb0d40304968735db5e85fc81e451a149bf05cc0.tar.gz tor-cb0d40304968735db5e85fc81e451a149bf05cc0.zip | |
Merge remote-tracking branch 'tor-github/pr/677'
Diffstat (limited to 'src')
| -rwxr-xr-x | src/test/test_rust.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 00b3e88d37..804d2ada36 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -14,11 +14,12 @@ rustc_host=$(rustc -vV | grep host | sed 's/host: //') for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then + # shellcheck disable=SC2086 cd "${abs_top_builddir:-../../..}/src/rust" && \ 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" \ - --target $rustc_host \ + --target "$rustc_host" \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi |