Parcourir la source

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

Nick Mathewson il y a 5 ans
Parent
commit
cb0d403049
2 fichiers modifiés avec 5 ajouts et 2 suppressions
  1. 2 0
      changes/ticket29064
  2. 3 2
      src/test/test_rust.sh

+ 2 - 0
changes/ticket29064

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

+ 3 - 2
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