[tor-commits] [tor/maint-0.3.4] Use correct CARGO_HOME in test_rust.sh

[nickm@xxxxxxxxxxxxxx]

commit d935aceb2b2493999f0982834406a0604a12ab9d
Author: Taylor Yu <catalyst@xxxxxxxxxxxxxx>
Date:   Thu Jun 21 18:20:03 2018 -0500

    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.
---
 src/test/test_rust.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
index 95ffc2e65..c7d0439ad 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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits