tor

commit cb0d40304968735db5e85fc81e451a149bf05cc0
parent 2d5c6cddc434cb04ca8a1ce1f2922d6f639d229a
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri,  1 Mar 2019 08:22:43 -0500

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

Diffstat:
A
changes/ticket29064
 | 
2
++
M
src/test/test_rust.sh
 | 
5
+++--

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changes/ticket29064 b/changes/ticket29064
@@ -0,0 +1,2 @@
+  o Code simplification and refactoring (shell scripts):
+    - Fix shellcheck warning in test_rust.sh. Fixes issue 29064.
diff --git 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