]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Fix a bug in my fix for #26258
authorNick Mathewson <nickm@torproject.org>
Sat, 16 Jun 2018 17:08:40 +0000 (13:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Sat, 16 Jun 2018 17:08:40 +0000 (13:08 -0400)
The fix here is use a different bourne shell subsitution for
CARGO_ONLINE, so that an empty string counts as set.

src/test/test_rust.sh

index 8e8d29b895cc3b3429a9cce7037fb87448a37dec..95ffc2e65976cfd3d2b7ebeea2f4c36d5d08d9e3 100755 (executable)
@@ -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