From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 16 Jun 2018 17:08:40 +0000 (-0400)
Subject: Fix a bug in my fix for #26258
X-Git-Tag: tor-0.3.3.8~19^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ccf1eb3164a48de042dfdd8712f4b788bfefdc49;p=thirdparty%2Ftor.git

Fix a bug in my fix for #26258

The fix here is use a different bourne shell subsitution for
CARGO_ONLINE, so that an empty string counts as set.
---

diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
index 8e8d29b895..95ffc2e659 100755
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@ -9,7 +9,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do
 	cd "${cargo_toml_dir}" && \
 	    CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
 	    CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \
-	    "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE:-"--frozen"} \
+	    "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \
 	    ${EXTRA_CARGO_OPTIONS} \
 	    --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1
     fi