From 10455aeff228042ee769205e43788d0e81cde910 Mon Sep 17 00:00:00 2001
From: rl1987 <rl1987@sdf.lonestar.org>
Date: Fri, 1 Feb 2019 20:53:40 +0200
Subject: [PATCH 1/2] Fix shellcheck warnings in test_rust.sh

---
 changes/ticket29064   | 2 ++
 src/test/test_rust.sh | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 changes/ticket29064

diff --git a/changes/ticket29064 b/changes/ticket29064
new file mode 100644
index 0000000000..616b8aa77e
--- /dev/null
+++ 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
index 00b3e88d37..da2bd32d21 100755
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@ -16,10 +16,10 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do
     if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then
 	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 \
-	    ${EXTRA_CARGO_OPTIONS} \
+            --target "$rustc_host" \
+	    "${EXTRA_CARGO_OPTIONS}" \
 	    --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1
     fi
 done

From ad48aab0565e8498fd68428fb2cfaa46b39ffc01 Mon Sep 17 00:00:00 2001
From: rl1987 <rl1987@sdf.lonestar.org>
Date: Wed, 13 Feb 2019 15:04:12 +0200
Subject: [PATCH 2/2] Let's not double-quote EXTRA_CARGO_OPTIONS after all

---
 src/test/test_rust.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
index da2bd32d21..804d2ada36 100755
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@ -14,12 +14,13 @@ 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'}" \
             --features "test_linking_hack" \
             --target "$rustc_host" \
-	    "${EXTRA_CARGO_OPTIONS}" \
+	    ${EXTRA_CARGO_OPTIONS} \
 	    --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1
     fi
 done