From: Taylor Yu <catalyst@torproject.org>
Date: Thu, 21 Jun 2018 23:20:03 +0000 (-0500)
Subject: Use correct CARGO_HOME in test_rust.sh
X-Git-Tag: tor-0.3.3.8~5^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d935aceb2b2493999f0982834406a0604a12ab9d;p=thirdparty%2Ftor.git

Use correct CARGO_HOME in test_rust.sh

Out-of-tree builds could fail to run the rust tests if built in
offline mode.  cargo expects CARGO_HOME to point to the .cargo
directory, not the directory containing .cargo.

Fixes bug 26455; bug not in any released tor.
---

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