]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Use correct CARGO_HOME in test_rust.sh
authorTaylor Yu <catalyst@torproject.org>
Thu, 21 Jun 2018 23:20:03 +0000 (18:20 -0500)
committerTaylor Yu <catalyst@torproject.org>
Thu, 21 Jun 2018 23:20:03 +0000 (18:20 -0500)
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

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